tree 7bb4d7faf4795c1628676ed8c7d681e401f1c7d8
parent 0948545e304be3f23e0e9bcdfefa49895ce0c3c0
parent 2182bf5ac836fcc740fd5c65e76890ca53dce1b7
author Mark Renouf <mrenouf@google.com> 1414850893 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414850893 +0000

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