OSDN Git Service

Merge "Replace MallocHelper with std::unique_ptr." am: 8330d5212d am: 6dfb0ca3d5
authorElliott Hughes <enh@google.com>
Fri, 23 Jun 2017 21:38:59 +0000 (21:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Jun 2017 21:38:59 +0000 (21:38 +0000)
am: 7bb95c55c0

Change-Id: I3e78c1732189a07e2ff17b046f71c7db435d9e3c

1  2 
core/jni/android/opengl/util.cpp

Simple merge