commit | 97d2587d87d237dc319d335e2ca5ddc960062fca | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Jun 12 07:23:36 2013 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Wed Jun 12 07:23:36 2013 -0700 |
tree | b2ac51677529f069ad615765068d1a74ec6dbb93 | |
parent | 322252855a8ebb8eb1ef86428a29fcf7350893ac [diff] | |
parent | 4e989b82cc7068d1297d49a5d8ef35bdd7e02fde [diff] |
Reconcile with jb-mr2-zeroday-release - do not merge Change-Id: I02e004028811a3efad8c010ed19e216bb87814d7