commit | 911c869042ab71fe4f27b525f49a4d7f6ce08af6 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Jul 11 08:23:02 2013 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Thu Jul 11 08:23:02 2013 -0700 |
tree | 48c97ced312186f0a073e5014f33b3ccc286ab21 | |
parent | bceb5c65f42058c13dde181e27280c8ad7155890 [diff] | |
parent | ddbc7a2996194fe834a78bf1f8178c3b16df8c66 [diff] |
Reconcile with jb-mr2-zeroday-release - do not merge Change-Id: I6d20c6a1a715d268e014dca7419ddaee12d4cbd9