| commit | 6217aa862de099fd5fd49b397cffbb1abf5a658c | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Mar 27 10:19:41 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 27 10:19:41 2012 -0700 |
| tree | 11b1632b1221abb176b0116718068f9009a66167 | |
| parent | aa01d1abefb1e90f6168617e47c4853201587b6a [diff] | |
| parent | 3eb3d2e31afcfca6d0cc54a1f60807da50e97965 [diff] |
am 3eb3d2e3: (-s ours) am acd30108: am d17c8977: am 0b6a436f: Merge "Fix build" * commit '3eb3d2e31afcfca6d0cc54a1f60807da50e97965': Fix build