commit | a6405e9da2200f09c2d23270ab104ee22c25b046 | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Wed Aug 22 11:02:42 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 22 11:02:42 2012 -0700 |
tree | 8c45f5dd26a6bdb9af8e55cda26bd8418b724ba8 | |
parent | 487d6d3db3f504b0120fc605ad3a4155ca214674 [diff] | |
parent | db56bb4aebb2aaa63cf33c2f9868a22ea655b38e [diff] |
am db56bb4a: Merge "libcorkscrew: avoid future name collisions." * commit 'db56bb4aebb2aaa63cf33c2f9868a22ea655b38e': libcorkscrew: avoid future name collisions.