| commit | 11b95c60f09ccad9a205d5dbb0be2e8441bd92a5 | [log] [tgz] |
|---|---|---|
| author | Gloria Wang <gwang@google.com> | Thu May 19 03:44:31 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 19 03:44:31 2011 -0700 |
| tree | a682011d320462a7c841ea4260b587dd21a01d57 | |
| parent | aee08c538364c4d7f65907765f7d01039b4e7c1f [diff] | |
| parent | f066f6cffe1f6757174f5c26e49ef6fc5524e3d5 [diff] |
am 8d161fe1: (-s ours) am 5a6c3d49: am 07e9267d: Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into honeycomb-mr2 * commit '8d161fe1eafe80e01d84d2be55ae47314f944721': DO NOT MERGE For bug 4422428 Squashed commit of the following: