| commit | f81fa0e5f3eb0f122b2c70da05edb5387853e21f | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:24:33 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 12:24:33 2012 -0800 |
| tree | 285d8e0db6df2a8068dc28578e8abd8a0ad52765 | |
| parent | b24e661c66f1f75828f82a3e70a49ef93b2c434a [diff] | |
| parent | 1508faa583ba640101feafcadba6015bc7ff524f [diff] |
am 1508faa5: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit '1508faa583ba640101feafcadba6015bc7ff524f':