OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 20 Mar 2013 16:32:48 +0000 (09:32 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 20 Mar 2013 16:32:48 +0000 (09:32 -0700)
Change-Id: Id9603d15a01a36a07a95a23336e62a6b2c58bc16


Trivial merge