tree d10e4916fd9e5e34fbbc502dffba976a6428dfec
parent e2e95c8ccba2c2fb979d0ed42ed905106623d3c3
parent 58b6a67096b5c5ac0250adbd222fcfd4afda2642
parent 286d5fad99c6e689e03ce7c302930ded387b1bef
author The Android Open Source Project <initial-contribution@android.com> 1350311936 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1350311936 -0700

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

Change-Id: I50d7a0cbc6632c78a725810d960e049c310b3597