tree 631adf301ff844b712f7f645fd6525a67ee316b0
parent 40828eab739af1ddc699d9c96e410ef1f107209d
parent 78e74a6d967b4a83bd988014348f93ea2abc7893
author The Android Open Source Project <initial-contribution@android.com> 1338398165 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1338398167 -0700

Reconcile with jb-release

Change-Id: I9bb797498b39567179bd733a4269d12ad2dff815