tree 70f28ae807a4824f64422b82061dbe5c3861f82a
parent 57ba9b82d34bbb5008ce3c39f89d5191ff79f285
parent cc2dea62067780ab63fe637a370019dd2bce034d
author The Android Open Source Project <initial-contribution@android.com> 1337391733 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1337391733 -0700

Reconcile with jb-release

Change-Id: I844298c1774f33c14b2cab56fa9f8ba23485faaf