commit | d2b97f76a9bd2726d1cb09c43aaf13a34375ccaf | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Mon Jul 01 07:42:28 2013 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Mon Jul 01 07:42:28 2013 -0700 |
tree | 9e250629fde66946f39056f611118a892eb79564 | |
parent | 90d5d8f077e24e1c4072af4b57eb28066bc0121a [diff] | |
parent | a4919bec0fac6202afb6a37f396d53aa2dfd8da6 [diff] |
Reconcile with jb-mr2-zeroday-release - do not merge Change-Id: If4968b73ad8cb2b7ddf8333507a803378b8e3d53