tree e026f0673b67757f07470822afebda600ee56ff9
parent 7523901fd9f17e9755b1e4e37201edade0dc24f6
parent fb4cbacd62f3a654962dd7de911c0945a6ccea06
author The Android Open Source Project <initial-contribution@android.com> 1337717105 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1337717105 -0700

Reconcile with jb-release

Change-Id: I9597b2581342c91f69bbabec6cda064dd3c8275e