OSDN Git Service

Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 16 Jul 2013 18:19:23 +0000 (11:19 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 16 Jul 2013 18:19:23 +0000 (11:19 -0700)
Change-Id: I44d1b4bc2d06e2ec3d7837693a1880d7e6cf1774


Trivial merge