tree d411d2ae3040cd6f82332a9d05db5ec40fe5443b
parent 0a2b01dc51dd364166d81c5e73fe2b2c84a4f5d9
parent 5fa38ef9c80a89a25b3a116000012ac7ce0aa941
author The Android Open Source Project <initial-contribution@android.com> 1341342703 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1341342703 -0700

Reconcile with jb-release

Change-Id: Ic12bd9ea68dde200b868659ed6134332fda8f244