OSDN Git Service

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


Trivial merge