OSDN Git Service

Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 21 Jun 2013 00:31:59 +0000 (17:31 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 21 Jun 2013 00:31:59 +0000 (17:31 -0700)
Change-Id: I179642d15ce613dac101897cadf2c63ca60c5a11


Trivial merge