OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 23 May 2013 15:05:43 +0000 (08:05 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 23 May 2013 15:05:43 +0000 (08:05 -0700)
Change-Id: I92222f8b210362d6a0bd2577216a5df5f822608a


Trivial merge