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)
Change-Id: Ibbe777e000d41acd338e396199bb93e652b38d26


Trivial merge