| commit | ab2e00be4b8228fcde1e92d04232a1df5cae2504 | [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 | 78cd32c28f9d90487fac53f86cf064a496f1f203 | |
| parent | 0856368d03f59b2d4765b725971497a55d9b597c [diff] | |
| parent | 175766c8e443a3d4f17a6947813820305a5b4ab2 [diff] |
Merge "Prevent conflict with deprecated pixel format constants"