tree 1e10086af18fc6f825d7e61bc0243018b4654ecb
parent d908a88a80d35fc1198d33c688eab023ba7bd55d
parent b2ce8ab56e3e6827772eed8c935c3ed92c991b78
author The Android Open Source Project <initial-contribution@android.com> 1371393824 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1371393824 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: Icce5a029a8cfb3444ece5f8c489f75619ed67a77