OSDN Git Service

If no display settings are matched, return the first one. DO NOT MERGE automerge...
authorMark Renouf <mrenouf@google.com>
Tue, 4 Nov 2014 07:15:18 +0000 (07:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 4 Nov 2014 07:15:18 +0000 (07:15 +0000)
automerge: 01afc37  -s ours

* commit '01afc37403a244e75fbfa385b197d76e476213e8':


Trivial merge