tree 648b1d3d905516553b8a4d7062ab5a96d317d54b
parent 6c1512cc61c5482eb1adaf6554478182a2587d7f
parent a18f412b406672f8f99d709ce9c704d3bb0fe106
author Amith Yamasani <yamasani@google.com> 1426893144 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426893144 +0000

am a18f412b: am c255257c: am 8bf486ee: Follow API change to rename *Blocked to *Hidden

* commit 'a18f412b406672f8f99d709ce9c704d3bb0fe106':