tree 458e78f8298d84d006396014f962e109dc35c96e
parent 05a5447cec9c7aa36da5f2cd2c7bb947c227cf41
parent 8187d671c1b26d573b746dcfa7585a53b563c8a8
author Chris Wren <cwren@android.com> 1381255815 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381255815 -0700

am 8187d671: am 2a38c287: roll back market integration

* commit '8187d671c1b26d573b746dcfa7585a53b563c8a8':
  roll back market integration