OSDN Git Service

Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 19 Dec 2012 22:33:27 +0000 (14:33 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 19 Dec 2012 22:33:27 +0000 (14:33 -0800)
commite57594a6934a912ab7b1bd0b8bdaff187ae25ca3
tree571f958e0953894c88befb54d0e1a40545510e37
parent9cb91beb705bc468028da0cd04471f5f3783d031
parent4505bf3c298ca5c5116ef893be7082f36f3749fb
Reconcile with jb-mr1.1-release - do not merge

Change-Id: I6f627ab7e473280d29846f3523d8cfe9b648df7d