OSDN Git Service

Sync with jb-mr1-dev
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 31 Jul 2012 14:51:52 +0000 (07:51 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 31 Jul 2012 14:51:52 +0000 (07:51 -0700)
Change-Id: I8ad322a285ffbcda32be279f3e06fdb2908789d9


Trivial merge