| commit | baca80b57b0d154d2c486e17c8efef04c6e8c67b | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Oct 11 08:08:29 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 11 08:08:29 2012 -0700 |
| tree | 643274fede34689cec74794c57069a1dfeaa12bc | |
| parent | f638b7e0a0fa8716e8a0844c8c02dcf4bc769fd7 [diff] | |
| parent | 436faffe3c99955eee2ccd9df3e0b2cd1510c01c [diff] |
am 436faffe: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '436faffe3c99955eee2ccd9df3e0b2cd1510c01c':