tree bd4aeef2de1cc07917abf9bf0a9d03dc08f3282d
parent 92736efab068bdbfeb1177544907b84511fb04e0
parent f1a6123f9a05bdfe48129a9ed09ea6fcfe70e1f1
parent 1cbe0ce40c523de48911fec2a94aec34e8ab14a3
author The Android Open Source Project <initial-contribution@android.com> 1352233167 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1352233167 -0800

Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I8de173f6b24b2f82b20e568e577878d8539e5148