OSDN Git Service

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


Trivial merge