tree e6e4939d89a60fb561f0c8bbaed0eeb662d17cef
parent d83f4ca4602fdb7fe5bca6dd764107f1711275c3
parent 530beda34c2082a2e2866f5a673c004dcb15c992
author The Android Open Source Project <initial-contribution@android.com> 1352130966 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1352130966 -0800

Reconcile with jb-mr1-release - do not merge

Change-Id: I07e84f6c8bf9dd462eaf105d9dc663276cc1aa60