OSDN Git Service

Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 8 Feb 2013 23:40:29 +0000 (15:40 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 8 Feb 2013 23:40:29 +0000 (15:40 -0800)
Change-Id: I242df2bfe9436a6b16e952da318b67b212e54516


Trivial merge