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:18:44 +0000 (12:18 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Nov 2012 20:18:44 +0000 (12:18 -0800)
commitf9bac00620691f281df42d390517da2e37df8749
tree1d59b892c9f1e7d16cf2f3d5ef31dbcb3286c776
parentfd34f989608dc02b0cdfbb7012c4c824a5107ded
parent62abddace39aaefecaac10779a6ce2a213b7156c
parentbf3c2255601c501c424e97ff3cbfae53dac1567b
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: Ic248a0dc1baadcebad816f4870655a826fa7a5d7