OSDN Git Service

Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 18 Dec 2012 17:44:14 +0000 (09:44 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 18 Dec 2012 17:44:14 +0000 (09:44 -0800)
Change-Id: Ic8d9ce1145f5905986ee9b567f020a8cc7a58058


Trivial merge