| commit | cf9998d5ce2338f9910bc57429028de725cc37d9 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <[email protected]> | Tue Jun 25 16:11:12 2013 -0700 |
| committer | The Android Open Source Project <[email protected]> | Tue Jun 25 16:11:12 2013 -0700 |
| tree | 55699d32ff1b2fe36881b64888ef898505c52f7a | |
| parent | 0fda8b466783cb001a847fd1eaf3bd727933f4be [diff] | |
| parent | 69faf0c9922afd50bb4e790a4e08b5b4e8eb39b1 [diff] |
Reconcile with jb-mr2-zeroday-release - do not merge Change-Id: Ifa305b94f98b4972a3dd95a5e2e49e4182ceeee9