commit | fabda5894c2793b37650ce3bc1697effd86af88b | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Jun 12 07:23:31 2013 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Wed Jun 12 07:23:31 2013 -0700 |
tree | 6f51b95810e166ac78ef103ff2be3022bdae48d5 | |
parent | 1bc14ed9c3bb0fae28c2cdf9319b2f5f892409eb [diff] | |
parent | 00416842550ea5f2c6a5bc0e4c82a3b4fe27ad9a [diff] | |
parent | b543526c977d4399e706e2f26f6cca5ce1c6e633 [diff] |
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge Change-Id: Ife328fef3a7cc1a88562fd88a85daa626b19c930