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)
Change-Id: If914c03547187deadfbb5f9c3fdff0cbe954ecba


Trivial merge