tree cba62d0d64153aa2169651696bc238591341d679
parent 86a456a7116e999dd1c8e67376f2c3b28f1f5330
parent 6332d95722452ba38903eb6ca8eaafc14f07b8a6
author Chris Wren <cwren@android.com> 1414085295 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085295 +0000

am 6332d957: am 723fce8f: am 68d5cf43: am 8187d671: am 2a38c287: roll back market integration

* commit '6332d95722452ba38903eb6ca8eaafc14f07b8a6':