OSDN Git Service

Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 25 Jun 2013 23:10:44 +0000 (16:10 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 25 Jun 2013 23:10:44 +0000 (16:10 -0700)
commit90aa9d848485a9209e80b1beadecf8dd3ba3553c
tree144b24d27f46e4068a1e3ecab1d204becbc298cb
parent4c4b6b2a0bcfe662a6954e6d63cebe4a39fc5de1
parent627c2b2fcb38e348ad8bf3c30ca1c5cc79572775
parentd829e5c4506901459478045ba5fb54348935e02d
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge

Change-Id: Ibbe777e000d41acd338e396199bb93e652b38d26