| commit | b6ec0c821be102b4657ac5acbad564d4206df14e | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 09 07:35:46 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 09 07:35:46 2012 -0700 |
| tree | 9a3910b32d912bdb237ef87dbd297fe2d4dabe44 | |
| parent | 73871eb2cf6f720ede1004fbbe80e6610f179c84 [diff] | |
| parent | 9acbd28e7c22df3f5f59974bf199f08622941248 [diff] |
am 9acbd28e: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '9acbd28e7c22df3f5f59974bf199f08622941248':