tree 70a16acb888edf8ddebb0f5b4f2d306a763b56e0
parent 30dce3d9b05a210943be9429f5615e0e277dd657
parent b9e0d845ef41aa59bbe3f1e1a83978fc66746260
author The Android Open Source Project <initial-contribution@android.com> 1337717200 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1337717200 -0700

Reconcile with jb-release

Change-Id: Ibc858f78c560ad80f6bf201f33dc2b9e0f3e00aa