OSDN Git Service

Reconcile with jb-mr2-deb-factory-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 3 Jul 2013 21:10:21 +0000 (14:10 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 3 Jul 2013 21:10:21 +0000 (14:10 -0700)
Change-Id: I8cef01a88b58eb33c82f6f6080d43490847fc377


Trivial merge