| commit | 159cd3f13ddd7e1dea418a6c03f3772ac32b2450 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Jun 03 14:07:16 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 03 14:07:16 2013 -0700 |
| tree | 0012e779df2f908ebf45bc0c93615bc8172a51d8 | |
| parent | b3714b1830ce154f12a22c0d0683912140667ba7 [diff] | |
| parent | 9c2d459e952b65029bbb7d280a1fcc971896cf22 [diff] |
am 9c2d459e: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '9c2d459e952b65029bbb7d280a1fcc971896cf22':