tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent 785ca6bb42594fff4d8d9d45c8f08e736f5733c1
parent b2de1ff5a363a287ea2b3bf32c4388af4e5570b1
author Winson Chung <winsonc@google.com> 1392411001 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411001 +0000

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

* commit 'b2de1ff5a363a287ea2b3bf32c4388af4e5570b1':