| commit | 05370dfed96ad3af9bfe5bb373874681dc167b91 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Nov 05 07:58:19 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 05 07:58:19 2012 -0800 |
| tree | a960c294ace9a5c3f358f8d9faf36136a68cef3b | |
| parent | eaad4ce11cdfac9011f88bbcdea6428e0d6fd145 [diff] | |
| parent | cbc4bba50fe9efaedbe186dc799d36df70ea0001 [diff] |
am cbc4bba5: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'cbc4bba50fe9efaedbe186dc799d36df70ea0001':