OSDN Git Service

Merge "Added CloseGuard for BaseObj" am: 64c4c1c
authorYang Ni <yangni@google.com>
Thu, 31 Mar 2016 23:09:02 +0000 (23:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 31 Mar 2016 23:09:02 +0000 (23:09 +0000)
commit087ffb6a08fa5aca65d09197a541ef597e53ed43
treefd9c18a1515a68a3ce16732c751ecf921aeec9d9
parentd4306fd59029a650c741bcb9a305e83e09f2a8e4
parent157c73cab3d24969c2b52a9ec2f9c6fb6cacb603
Merge "Added CloseGuard for BaseObj" am: 64c4c1c
am: 157c73c

* commit '157c73cab3d24969c2b52a9ec2f9c6fb6cacb603':
  Added CloseGuard for BaseObj

Change-Id: Ic5d51599ef1939c2784f9cc2b693cc2370afb0a0
rs/java/android/renderscript/Allocation.java
rs/java/android/renderscript/Script.java