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