tree cba62d0d64153aa2169651696bc238591341d679
parent adc3d45f4f60301bf4fcdfafb599b71e83b59168
parent 4af3c6047777f4fec0030c9806a37640fb004916
author Winson Chung <winsonc@google.com> 1414085218 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085218 +0000

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

* commit '4af3c6047777f4fec0030c9806a37640fb004916':