| commit | 8e1c7f72afc3b4aa6dc59ee37584fe06d8408633 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Aug 22 15:37:19 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 22 15:37:19 2012 -0700 |
| tree | 3935d5c0939a5635c00996c1a07b14602d503516 | |
| parent | 34e9a4486aeeaa104f534629a0bea2fccd2bc88a [diff] | |
| parent | 90fc5310e57369e0b47b184cb18c2ec76afe6cca [diff] |
am 90fc5310: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '90fc5310e57369e0b47b184cb18c2ec76afe6cca':