tree 91e3718896ccf918ab6d5fc43497011029c5766a
parent 02fd29246ab54ee4a0f8fa6358498070e54e5fd0
parent b4ef91b97513434a13d6d84a810512315ecf4768
author Jean-Baptiste Queru <jbq@google.com> 1345657390 -0700
committer android code review <noreply-gerritcodereview@google.com> 1345657391 -0700

Merge "libcorkscrew: avoid future name collisions."