| commit | e7456f8d6bfe0bd1df2bc244b7720c6eb5a0a10e | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Sep 06 09:12:22 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 06 09:12:22 2012 -0700 |
| tree | 140a63edb53b7173fa8076b8d009bf670e82c1b3 | |
| parent | b54312471d4f31b9c115d2256be5204d44bfee0e [diff] | |
| parent | fe3e1111f6f1c616d754625e161615cd73450c52 [diff] |
am 41774aab: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '41774aaba22e34f51960a1b657a01eb8ae112a03':