| commit | eef1854f48cb1df6be07ce192975eda424f55bff | [log] [tgz] |
|---|---|---|
| author | Romain Guy <romainguy@google.com> | Thu Dec 15 01:27:28 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Dec 15 01:27:28 2016 +0000 |
| tree | 1410d598a2618f6ca7a674f9c84c775220a4bb6a | |
| parent | eac988cdd90a4b00bec51d2d136ad7135e4c375f [diff] | |
| parent | 0c6dde615915551058cf162257be5c0f2eb77caa [diff] |
Merge "Prevent conflict with deprecated pixel format constants"