| commit | a705456a62bf93456cc71425a39e1003022e109a | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue May 21 09:02:35 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 21 09:02:35 2013 -0700 |
| tree | 25889df9d9a512dbe7d571999d8a1b9379cad4be | |
| parent | a1e7617e7e6ad6426ef4d7f042346e7af8b818e9 [diff] | |
| parent | 9be6ae7264fd203f353a37604a50a963e5814143 [diff] |
am 9be6ae72: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '9be6ae7264fd203f353a37604a50a963e5814143':