OSDN Git Service

Merge changes Iea048eaa,I5c246571 into nyc-mr1-dev
authorCourtney Goeltzenleuchter <courtneygo@google.com>
Tue, 12 Jul 2016 23:12:00 +0000 (23:12 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 12 Jul 2016 23:12:01 +0000 (23:12 +0000)
* changes:
  Add support for multiple color modes
  Remove unused DisplayInfo structure


Trivial merge