commit | 9aaf2a65e3cbc6866cfd50fe5f3341063c71f36f | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Jun 06 10:37:26 2013 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Thu Jun 06 10:37:26 2013 -0700 |
tree | 16c0b2fde4589fcbd6d271b6b7a9192349001d96 | |
parent | 3d74636915254e13957a59fc307dbf8fc396e7e9 [diff] | |
parent | 69cde0e6efbbc98d412bc54c260e8241ed98248b [diff] |
Reconcile with jb-mr2-zeroday-release - do not merge Change-Id: I2ff8807ad12569b93bbed8cf242c8fd1758d7bcb