commit | 828df0977d111e959e03d2886cced2d38b6ebbc1 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Sun Jun 16 07:43:55 2013 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Sun Jun 16 07:43:55 2013 -0700 |
tree | 5f6993a00974e3d8585c7b9b2d31902e6ad01f06 | |
parent | 97342f49002d2d97f11e0105a2aff25782d9f4ac [diff] | |
parent | 6976c3853afd70a7b4fd7a3330823c774c604e66 [diff] |
Reconcile with jb-mr2-zeroday-release - do not merge Change-Id: Ia2af8d01edfb1b4d7a1c9cd5f1822a971294e707