OSDN Git Service

Merge "Prevent conflict with deprecated pixel format constants"
authorRomain Guy <romainguy@google.com>
Thu, 15 Dec 2016 01:27:28 +0000 (01:27 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 15 Dec 2016 01:27:28 +0000 (01:27 +0000)
commitab2e00be4b8228fcde1e92d04232a1df5cae2504
tree78cd32c28f9d90487fac53f86cf064a496f1f203
parent0856368d03f59b2d4765b725971497a55d9b597c
parent175766c8e443a3d4f17a6947813820305a5b4ab2
Merge "Prevent conflict with deprecated pixel format constants"