| commit | 38f60c1ec6cb1f58ddad13a1edc6a1c4dfd2ac9c | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Oct 31 09:28:08 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 31 09:28:08 2012 -0700 |
| tree | 38d9ca70713201a2d5a8e00f590eaf320b9c4516 | |
| parent | 13e4038688a419ac01e19ec9fc863a10aa6ff169 [diff] | |
| parent | ed9208c36ae0d0d93f93412e76eb0ce7d41eed7b [diff] |
am ed9208c3: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'ed9208c36ae0d0d93f93412e76eb0ce7d41eed7b':