OSDN Git Service

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


Trivial merge