| commit | 659790fe81b008178178e98ebc83d70ba08631cf | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue May 28 13:50:15 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 28 13:50:15 2013 -0700 |
| tree | 6bf8b19a2da7a99bbc234320f5dd5203a69c29f9 | |
| parent | d37c0ab389097568de23a497dfc2539cae0676be [diff] | |
| parent | 95940790ad7160cfc9d497a9fe49446970f90056 [diff] |
am 95940790: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '95940790ad7160cfc9d497a9fe49446970f90056': "JWR58" "JWR57" "JWR56"