OSDN Git Service

Reconcile with jb-mr1-factory-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Nov 2012 20:16:14 +0000 (12:16 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Nov 2012 20:16:14 +0000 (12:16 -0800)
Change-Id: I470d1b8e5f8bc1766187486d2ea8950ed45431c6


Trivial merge