| commit | cf48d5595b362635f3bda05089247ee5cda9a3ad | [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 | 4a9144578ccef3be17ffc0dc3dce7d4c6dbe6f5a | |
| parent | 58c3151add8a2b26b6d2180bb4910f237683a1a7 [diff] | |
| parent | 41774aaba22e34f51960a1b657a01eb8ae112a03 [diff] |
am 41774aab: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '41774aaba22e34f51960a1b657a01eb8ae112a03':