OSDN Git Service

Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 5 Dec 2012 19:10:12 +0000 (11:10 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 5 Dec 2012 19:10:12 +0000 (11:10 -0800)
commit7eefa3225a1fad9fdd6c133edc2dfd798df6697e
treefae864c5218afbae646fd6d489123ec418f52a8b
parentd57ddeb8fc4c157af8d423c92d9998abd47f6fd8
parent2ebe99ad9a0ca51cc4df919a025f2e1b17c7890d
Reconcile with jb-mr1.1-release - do not merge

Change-Id: If914c03547187deadfbb5f9c3fdff0cbe954ecba