| commit | 699acff6d9effcd17763761df2a345975d0fdb62 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Nov 02 07:30:20 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 02 07:30:20 2012 -0700 |
| tree | fb90bdf484d931322c08707793da1131a96353f0 | |
| parent | f9de6184ed183aa6757cd17b0c93ca8104c4e0f1 [diff] | |
| parent | 81d97c8131d4abc56c12663d70d505e581f11476 [diff] |
am 81d97c81: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '81d97c8131d4abc56c12663d70d505e581f11476':