tree f916c75ec47943b2df0d5cf0da233787f38f0055
parent dfeb60558e87879c9575b32281e9c22fec623198
parent 3d875f804018ebd48189633bb48ad6083c953eed
author Mark Renouf <mrenouf@google.com> 1414725727 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414725727 +0000

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

* commit '3d875f804018ebd48189633bb48ad6083c953eed':
  If no display settings are matched, return the first one. DO NOT MERGE