| commit | 3959a81f6d8879367dc36a14b09dc082d162f189 | [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 | 90514df0a6c2ba7cfa9703aa88cdaa4fb40e8ef4 [diff] | |
| parent | 98361f86189f6b5f31580ce6f7e38e548c5a256b [diff] |
Merge "Prevent conflict with deprecated pixel format constants"