| commit | b5b52e73e9070408c6dd8b2d04a5f47ee50057b8 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Oct 31 09:19:14 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 31 09:19:14 2012 -0700 |
| tree | f7adb8c7787c10fd6709b1c5f25066ca028eb8bc | |
| parent | 8478dbc85fab5db5595910a5a0615ec74778ce68 [diff] | |
| parent | 089111a80a6a167de827bf32ae2d2a935ff5874f [diff] |
am 089111a8: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '089111a80a6a167de827bf32ae2d2a935ff5874f':