| commit | 96f1528dd637c6e806456d56c635ab2e92b0bd9b | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:29:13 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 12:29:13 2012 -0800 |
| tree | 02cd387cb319fcb364b197255b56b1a3cf7ea9c5 | |
| parent | e670d53f50a8070b247867ca96db57dc8a96e831 [diff] | |
| parent | f0e3acd06af00c07bfb541090b5349618fa67507 [diff] |
am 33cf49b1: (-s ours) am 78b012f5: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit '33cf49b168a88a88167c46b01787a57b49cd875f':