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:23 +0000 (12:18 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Nov 2012 20:18:23 +0000 (12:18 -0800)
commit4dd6c535cef6e9c05143cb5cf066a4c71c968da9
tree2a100e76cf886563624f3f76772afa6f0ba4f56d
parent78b21f3bdbcd4f333c992df5ac009f985925addb
parente56b51b0605d693cc69e57df79859f2b5bc18eae
parent2a7748a916789c289646ec33ee825276b8694424
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: Ic5ee78e018bd5706185edd8b01de3cb6bf121ed4