diff options
| author | Jesse Hall <jessehall@google.com> | 2014-05-22 04:41:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-22 04:41:19 +0000 |
| commit | 7de53d693eb4b70431514481d9da30b80f007939 (patch) | |
| tree | 89e3150fc929c216d90392e678ea68305ecffa2f /core/java/android/provider/DocumentsProvider.java | |
| parent | d754583d1d3b4aa4c06d78ab1350ddd668aa213d (diff) | |
| parent | 9626f8203a8c222b8960a49cdc66d540fdb688b0 (diff) | |
| download | frameworks_base-7de53d693eb4b70431514481d9da30b80f007939.zip frameworks_base-7de53d693eb4b70431514481d9da30b80f007939.tar.gz frameworks_base-7de53d693eb4b70431514481d9da30b80f007939.tar.bz2 | |
Merge changes Iad983802,Icda236ee
* changes:
opengl: Fix #include style in generated JNI code
opengl: Un-hide GLES31 and GLES31Ext classes
Diffstat (limited to 'core/java/android/provider/DocumentsProvider.java')
0 files changed, 0 insertions, 0 deletions