tree 44ad28cff7bea440744c07c525eb223988e9c125
parent e46090e7845a9c27f5857aedca6027b71a90dd6c
parent 17361ad580713e3e508deadfc84553a6721fed6e
author The Android Open Source Project <initial-contribution@android.com> 1343425888 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1343425888 -0700

Reconcile with jb-release

Change-Id: I0e65efb4045e70313c50cdd49c4b68d69015b64e