tree aa36775312ff911e727c72064b75ab6b0e2deb38
parent 1cdda6a3753f5d776e026fdf421bab3289111cce
parent 02312279c39aa9827ff41cf3ef96aa66185474ca
author The Android Open Source Project <initial-contribution@android.com> 1351781551 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1351781551 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: I65f1a13c4c6203332e2184e5625dde8cc4cbb8f6