tree cd2c01aa3e0fc95e42c15c8f665ef83db3abd71a
parent 2eafc9fdf6b6b072ae0cbba82b0a3608c261cbb0
parent a28cef56a2e9491597cc07de42d43a33bf668031
author The Android Open Source Project <initial-contribution@android.com> 1345674103 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1345674104 -0700

Reconcile with jb-release - do not merge

Change-Id: I992c5faa8c3ba8978acfbf59f3f19fa2aef07ca3