| commit | 7a2d47ecbc4065bc5bcd6140165aef377d3dc197 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Jun 20 07:20:13 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 20 07:20:13 2013 -0700 |
| tree | a85a13aace175c1394d52ff1db6d66f496766964 | |
| parent | 1d71ff7d73a4bafdda0d3dfb70df617020ecf1bd [diff] | |
| parent | 3d828aa727a1127c28c1a535aebceb3af992f569 [diff] |
am 3d828aa7: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '3d828aa727a1127c28c1a535aebceb3af992f569': JWR66O