OSDN Git Service

am b8038d58: Merge "Hide Surface#lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev
authorJustin Koh <justinkoh@google.com>
Thu, 6 Nov 2014 20:33:36 +0000 (20:33 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 6 Nov 2014 20:33:36 +0000 (20:33 +0000)
commit2d42f484494e4183c42114ce5918fc4592a33fb6
treeb6e8f2a4c60b1eab59b232d78a218eb0032e091a
parent012849f452ee7cc72a28df3054fdbe68b5133cee
parentb8038d58da04456e9e7b6e264af69226bf21592c
am b8038d58: Merge "Hide Surface#lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev

* commit 'b8038d58da04456e9e7b6e264af69226bf21592c':
  Hide Surface#lockHardwareCanvas DO NOT MERGE
api/current.txt
core/java/android/view/Surface.java