OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Jul 2013 00:13:32 +0000 (17:13 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Jul 2013 00:13:32 +0000 (17:13 -0700)
Change-Id: Id26b917342f6ee70c32c2713d07944dae1c10e01


Trivial merge