tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent fd855986099c00c50bf62c2cd69796a9066d774d
parent bb678c73fc4391822f749a065950622b69ef608d
author Winson Chung <winsonc@google.com> 1392410129 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410129 +0000

am bb678c73: am c9830e5c: am f9e8640f: Merge "Disable update logic for market button." into jb-ub-now-indigo-rose

* commit 'bb678c73fc4391822f749a065950622b69ef608d':