diff options
author | Deepanshu Gupta <deepanshu@google.com> | 2015-04-02 21:08:31 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2015-04-02 21:08:31 +0000 |
commit | e6aac48c7da09c20abcafba8ab003848aa8448bc (patch) | |
tree | e371eaaf17dbdae8d37775d49380a41bad79de15 /emulator/opengl/shared/emugl/common/mutex_unittest.cpp | |
parent | 34642d1d63c784ae9fd3fe123143d0b3f0773932 (diff) | |
parent | bd79a42f7f0759858321a930c9faed6140ae85f2 (diff) | |
download | sdk-e6aac48c7da09c20abcafba8ab003848aa8448bc.zip sdk-e6aac48c7da09c20abcafba8ab003848aa8448bc.tar.gz sdk-e6aac48c7da09c20abcafba8ab003848aa8448bc.tar.bz2 |
Merge "Move to the new LayoutlibCallback." into studio-1.3-dev automerge: 80e3ce8
automerge: bd79a42
* commit 'bd79a42f7f0759858321a930c9faed6140ae85f2':
Move to the new LayoutlibCallback.
Diffstat (limited to 'emulator/opengl/shared/emugl/common/mutex_unittest.cpp')
0 files changed, 0 insertions, 0 deletions