OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Apr 2013 17:06:01 +0000 (10:06 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Apr 2013 17:06:01 +0000 (10:06 -0700)
Change-Id: I5597c4b46c146b190370d63e0128d2d84f80888a


Trivial merge