tree 33d0f9c5acf403c612c2c8f5b882ddb02d7b8500
parent 451dc0811e2a32c2446b7b5dea9c97e43a721015
parent e8ddd6e70069caa24205e4778a2a12e4e68dcf34
author The Android Open Source Project <initial-contribution@android.com> 1366047983 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1366047983 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: I326745b5eab66b6e7ec49cb0db1b66db6ca884fc