tree 2b95b4fc7be0065a6f72ac3f5b1072a5547b9640
parent 56b3152d5438cc6cd9bc3a8a2087a235252ebbc3
parent fb008d6ac3326649e422945de0e62022a64c8a33
author Adam Powell <adamp@google.com> 1410506517 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410506517 +0000

am 51eee88c: Merge "Remove View methods that can\'t be used safely from the SDK" into lmp-dev

* commit '51eee88c3355973ef648cef822f4a737c5b0a6b9':
  Remove View methods that can't be used safely from the SDK