OSDN Git Service

Merge jb-mr1-dev into aosp/master - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 27 Nov 2012 16:21:33 +0000 (08:21 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 27 Nov 2012 16:21:33 +0000 (08:21 -0800)
Change-Id: I9d78e7dd4f410c331a920294d9375118cc43a007


Trivial merge