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)
commitd8e8e66220cd71486a3b545096a1cdc298dee5fd
tree3d6d537b1187b7cb79d36ba395d1fe3f446a3042
parent02b95105754b1859a97e234b79f41489a4677c20
parent4ea5d656db0f5fcc4ae6c792ec83e157a2c1bae8
parentf67623632a545bd9ca1d8afefc3dd0789eaba6b3
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I219247f1b0f5d87b4144dc1535039e93fc636a94