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