OSDN Git Service

Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 6 Feb 2013 17:11:09 +0000 (09:11 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 6 Feb 2013 17:11:09 +0000 (09:11 -0800)
Change-Id: Icd2030678228e137e2616e2d64847abf4f5a2242


Trivial merge