tree 02dd173321157ee076e7693193205a2e4eca2795
parent 06ad5279dc2019a1ff0d23deb3feb8998faf2cc4
parent 0e50839c4f07bc1dddac010d7b52b6321bae6446
author The Android Open Source Project <initial-contribution@android.com> 1340982820 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1340982820 -0700

Reconcile with jb-release

Change-Id: I61b7e1608f928b9a9ae8c5a1a93996d3812cd744