| commit | f39d05083dd349732230011fabefb46bbe1082d8 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Jun 03 14:03:46 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 03 14:03:46 2013 -0700 |
| tree | e7948e990d227dbae2352a238a9989e5e95d4d1b | |
| parent | 8216f3228fbe5343b38e19f51fb91584946024cc [diff] | |
| parent | 20f6c310c70594e077310415b2756c9e1f42d6b5 [diff] |
am 20f6c310: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '20f6c310c70594e077310415b2756c9e1f42d6b5': "JWR64" "JWR63" JWR60E JWR60D JWR60C JWR60B