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 22:10:50 +0000 (14:10 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 21 Dec 2012 22:10:50 +0000 (14:10 -0800)
Change-Id: Iff920fa574533c1c22a8c1408291f43e81ab7a2f


Trivial merge