OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 30 May 2013 14:31:27 +0000 (07:31 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 30 May 2013 14:31:27 +0000 (07:31 -0700)
Change-Id: Ib7391931437918b090222401b2ef7c3c26f0b667


Trivial merge