tree b6e8f2a4c60b1eab59b232d78a218eb0032e091a
parent 012849f452ee7cc72a28df3054fdbe68b5133cee
parent b8038d58da04456e9e7b6e264af69226bf21592c
author Justin Koh <justinkoh@google.com> 1415306016 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415306016 +0000

am b8038d58: Merge "Hide Surface#lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev

* commit 'b8038d58da04456e9e7b6e264af69226bf21592c':
  Hide Surface#lockHardwareCanvas DO NOT MERGE