| commit | 0ae3304f8341cd91e48dc580294023a360f5e339 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu May 16 05:44:28 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 16 05:44:28 2013 -0700 |
| tree | c2e6c07a45d38ec63b1700162daa2b65c968b406 | |
| parent | 217c81648000da947264437961f9f624385227f8 [diff] | |
| parent | 5b75f3bfa1a8f380ce213a0088afec7a7901a25b [diff] |
am 5b75f3bf: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '5b75f3bfa1a8f380ce213a0088afec7a7901a25b':