| commit | 3c83ae9dd741cf68e082c51d702b92f69912dbf8 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Jul 01 07:44:21 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 01 07:44:21 2013 -0700 |
| tree | 20b98d912e2284d820941f623c8e6b7b2357932c | |
| parent | 822136e2c00af935d0f3da4a509717252cb9c1da [diff] | |
| parent | ca650c5c89d29c0468be5b8fab97fc91a0e18ce5 [diff] |
am ca650c5c: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit 'ca650c5c89d29c0468be5b8fab97fc91a0e18ce5':