| commit | be431bb0e55260ad0ea7a09269669ca45d9db906 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 02 09:24:49 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 02 09:24:49 2012 -0700 |
| tree | c863be12f8bd333a11f463f9eef856aee17b7600 | |
| parent | bbdc6f0ca72a83c2a2ddd7bdc155c5b4a00cb7e8 [diff] | |
| parent | ffed1ede87553f8d6a104a5e92945fd5fa4557f9 [diff] |
am ffed1ede: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'ffed1ede87553f8d6a104a5e92945fd5fa4557f9':