OSDN Git Service

Reconcile with jb-nakasig-release jb-mr0-release jb-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 7 Sep 2012 22:20:57 +0000 (15:20 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 7 Sep 2012 22:20:58 +0000 (15:20 -0700)
Change-Id: Ibb66fb1e9c4c3066c8a27139922300a511ff9e7b


Trivial merge