| commit | 77eb74ee71ea4f49530edb5b15f899ac7a52fb9e | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Jun 26 12:34:19 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 26 12:34:19 2013 -0700 |
| tree | c5d096d9183832d6c4785388521dd25cd4c4a48d | |
| parent | d40e692dbf00e0c8b8162ca67ab63a177360e817 [diff] | |
| parent | 8e3bac1748ec48e75294eeed2fd84f9f1d244453 [diff] |
am 8e3bac17: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit '8e3bac1748ec48e75294eeed2fd84f9f1d244453':