| commit | 1e442932f876bacc96147093c2c37074e590519a | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Sep 24 09:29:40 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 24 09:29:40 2012 -0700 |
| tree | e842ce919d0a66171876083122259758ea555ebc | |
| parent | 9766b73c8847d85341c18c8e217a28c8de57ba28 [diff] | |
| parent | cc71f1ea0b090903ea0c9a5b71b1a440c26de101 [diff] |
am cc71f1ea: am d50926a0: (-s ours) Reconcile with jb-mr0-release - do not merge * commit 'cc71f1ea0b090903ea0c9a5b71b1a440c26de101': JZO54H