am 2182bf5a: am 3d875f80: am cf0f740e: (-s ours) If no display settings are matched, return the first one. DO NOT MERGE

* commit '2182bf5ac836fcc740fd5c65e76890ca53dce1b7':
  If no display settings are matched, return the first one. DO NOT MERGE
This commit is contained in:
Mark Renouf
2014-11-01 14:08:13 +00:00
committed by Android Git Automerger

Diff Content Not Available