| commit | ea88e2ffe86cad12387c8ab741c38de6e6e15713 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue May 21 09:02:34 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 21 09:02:34 2013 -0700 |
| tree | 521d32ef01d6e5f2de9543d015dd7b335dd63a1c | |
| parent | d96f63d2ed2dfcdfe8c83ed8b9020c2aae5b351d [diff] | |
| parent | 150da22528fcb9cd8c275428bd11e1e3f543f46f [diff] |
am 150da225: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '150da22528fcb9cd8c275428bd11e1e3f543f46f':