OSDN Git Service

Merge "Re-order the display settings items." into oc-dev
authorDoris Ling <dling@google.com>
Thu, 6 Apr 2017 17:01:45 +0000 (17:01 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 6 Apr 2017 17:01:46 +0000 (17:01 +0000)

Trivial merge