OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 9 Oct 2012 14:29:06 +0000 (07:29 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 9 Oct 2012 14:29:06 +0000 (07:29 -0700)
Change-Id: Ia76fbf94fed108207ae3cb4d53f710f81aa4311f


Trivial merge