diff options
| author | Jerry Zhang <zhangjerry@google.com> | 2016-12-13 01:08:08 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-12-13 01:08:08 +0000 |
| commit | 31c5c4cfc8e2bc3e578e69aa76e7e9c0236d40ba (patch) | |
| tree | ede609fa106c196993d056cdaf39541e8efe17df /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | d9291d55f6aa39a63311d7b1b6585f7a73aafd68 (diff) | |
| parent | 49950e68b2081ffe9eeaff9cec8a40d2cc2265aa (diff) | |
Merge "Merge "Modify UsbDeviceManager stack to allow MtpServer to use FunctionFS drivers." am: 1975240f17 am: 830874dbe7 am: 88672d7d29" into nyc-mr2-dev-plus-aosp
am: 49950e68b2
Change-Id: I6d111eb8c4afef7cb0615153c2949b0a3cf2155d
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions