OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 26 Mar 2013 17:49:32 +0000 (10:49 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 26 Mar 2013 17:49:32 +0000 (10:49 -0700)
Change-Id: I5556f655c440622963e3d1f89e6c8ac2bf45d53f


Trivial merge