OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 13 Jun 2013 01:04:25 +0000 (18:04 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 13 Jun 2013 01:04:25 +0000 (18:04 -0700)
Change-Id: Ib28265f84583e4c1c8860f359145f38737817e99


Trivial merge