Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 2 Nov 2012 14:28:26 +0000 (07:28 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 2 Nov 2012 14:28:26 +0000 (07:28 -0700)
Change-Id: Ie34407add6de1a599529f03ac8954c792c400fbe


Trivial merge