tree 8ad1b340a6cf206802d4d1c97919c0ef518782e6
parent 8ef7f717c59d95e2124dbeaf250fe76452085dfc
parent 348075fe8c42124911854777a8f932aec7ad2cd2
author The Android Open Source Project <initial-contribution@android.com> 1352733993 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1352733993 -0800

Reconcile with jb-mr1-release - do not merge

Change-Id: Icf259b354e115d0514bb0d6c33beffddb4bbcf35