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)
commit72d1772eca21cd1d109a7fe6ee927cbda4df64bc
tree88bb1f1f76eb4342ccbd88c3e5032ac617488c56
parent3717b164fad9308483fd75eff85fdefb21a9bd12
parentfad9d8cd070e94749d8eb5be8f92011c9567a44c
Merge changes Iea048eaa,I5c246571 into nyc-mr1-dev

* changes:
  Add support for multiple color modes
  Remove unused DisplayInfo structure