| commit | a2cf13c77260f98fc674f103dcbd2bb2488a80ce | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Jun 21 11:58:20 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 21 11:58:20 2013 -0700 |
| tree | a4e930abd2479fe1f8b143e0b624e7e43950ef4f | |
| parent | d77312bbaa86c68f9f43a68b2786e8875769d3c4 [diff] | |
| parent | e6105c26a5b506f96e9fe1d3fec64a8b2ed1d6dd [diff] |
am e6105c26: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit 'e6105c26a5b506f96e9fe1d3fec64a8b2ed1d6dd':