OSDN Git Service

Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 13 Jun 2013 15:22:30 +0000 (08:22 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 13 Jun 2013 15:22:30 +0000 (08:22 -0700)
Change-Id: I986e60e5558ca20ee361e768c46692bbbfc46237


Trivial merge