tree ab8b3623e49aa60802f237334ab674f03b4b0c30
parent 5c39fcdf7499aa3a2f94e29c6c99594620cb3c78
parent b1d709560fca799ff0e5ed4a94b4e674f3caa812
author The Android Open Source Project <initial-contribution@android.com> 1338309668 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1338309668 -0700

Reconcile with jb-release

Change-Id: I864bf6c218289fd89744dfba369fb2941c829bb6