commit | 5f5a28ed4fd4ab6fb5d97618db06f8dbd722aec2 | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Thu May 17 17:17:55 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 17 17:17:55 2012 -0700 |
tree | cb3f7167a6ee1c2de545f6eafbc40e340cd62a99 | |
parent | 320eb3e0b1bb415bdb01a71eda163f5f0fe08124 [diff] | |
parent | 669446e055b5a0d3a51ec8e825de3ed6f558ee8b [diff] |
am 669446e0: Merge "Fix build" into jb-dev-plus-aosp * commit '669446e055b5a0d3a51ec8e825de3ed6f558ee8b': Fix build