tree 92412e1f870f8c16792fedc27175ac78d78faa35
parent 2148133d46cb875316b01947dd5719ed995f7d67
parent c6ab95e9d17fd174df1dd07076fbf6251480ba09
author The Android Open Source Project <initial-contribution@android.com> 1373415176 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1373415176 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: Ib99b7cd6aede63006c91be2635112e16dd0f2b24