OSDN Git Service

Reconcile with jb-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 29 Jun 2012 15:13:34 +0000 (08:13 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 29 Jun 2012 15:13:34 +0000 (08:13 -0700)
Change-Id: I7aaa394cda0be63324f5cba09f93e444fd1763fc


Trivial merge