| commit | 406c3bb885538e5003efc3736cd2b57ffef2b5cc | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Sun Jun 16 07:49:23 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Jun 16 07:49:23 2013 -0700 |
| tree | 3e7bed6151a792d994e7f65170e8f664b71c4902 | |
| parent | fd914ee94c6a6a6383b88f6fc4ab296979f45dd9 [diff] | |
| parent | 0c3de6aff3cceb6e041a46a12e596b8e8819aa15 [diff] |
am 0c3de6af: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit '0c3de6aff3cceb6e041a46a12e596b8e8819aa15':