Reconcile with jb-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 7 Jun 2012 14:51:35 +0000 (07:51 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 7 Jun 2012 14:51:35 +0000 (07:51 -0700)
commita155651109589b4bf69c9af7e1d515b6b26cb3fe
tree72415b1ca438cf47240b3dbeb762ef151f0dc26c
parent8c4f42924ba55d636d19caeb2ccbdd7e32edc443
parent0bad15380890fef5e355489f1e4e8f33970e9694
Reconcile with jb-release

Change-Id: Icc86c6dba50bad25e4031c47a2580a1af4eeeb1e