tree cd989147d5b36fbda8ca413c698f1270eb429eb4
parent 3cd7a1653aa579213cb68a666bd9949e2b8fff95
parent f29c214d6ad97f9a5348407cc66a58aec2228ca9
author The Android Open Source Project <initial-contribution@android.com> 1351700116 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1351700116 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: Ice07f7813d823b0419153d5ac321ad784a690af4