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


Trivial merge