tree a4e0c414e583b6cc5ea26eccabb65e45172bde4e
parent 97270ce8ce17d77f773a2cafa9176afd73cc6f84
parent c292a619c71a2ee56e42ca5ef45fbc62e5c09f1e
author The Android Open Source Project <initial-contribution@android.com> 1341349763 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1341349764 -0700

Reconcile with jb-release

Change-Id: I2bd087f75ee99d101e38d0e7b62d0aa701283107