tree 54ea806ad493a0780c58d51a0dd0cae844e63925
parent e460692907542433e9ef263e9f61100dbcdead11
parent d757d67b3374fb67d4c4f9f91fd2ff6f98c636d2
author The Android Open Source Project <initial-contribution@android.com> 1339431652 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1339431652 -0700

Reconcile with jb-release

Change-Id: I29599ec6c0cb3bded40c528ba4f73648ae60227f