OSDN Git Service

Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 21 Dec 2012 15:59:28 +0000 (07:59 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 21 Dec 2012 15:59:28 +0000 (07:59 -0800)
Change-Id: Ic86ea3815748a11695d10b369d957ebdf647ab57


Trivial merge