tree 1ca9edc1e0d62418b23f7bf585cd3c18acb8b950
parent d977be2f3a0972c5d485ed392b0335b445f5cea6
parent ea764f5a4360baf08bd7bafbec5267933b8f5030
author The Android Open Source Project <initial-contribution@android.com> 1369151934 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1369151934 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: If6ae5387934e31b848fa0a8d34d3a0d38be4a77a