commit | 90aa9d848485a9209e80b1beadecf8dd3ba3553c | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Jun 25 16:10:44 2013 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Tue Jun 25 16:10:44 2013 -0700 |
tree | 144b24d27f46e4068a1e3ecab1d204becbc298cb | |
parent | 4c4b6b2a0bcfe662a6954e6d63cebe4a39fc5de1 [diff] | |
parent | 627c2b2fcb38e348ad8bf3c30ca1c5cc79572775 [diff] | |
parent | d829e5c4506901459478045ba5fb54348935e02d [diff] |
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge Change-Id: Ibbe777e000d41acd338e396199bb93e652b38d26