tree 46f20cec773df4341ee4c23f30535cd1d855bade
parent 0531a915a1078b67f9ceec7db9910a9f7f54f94b
parent 7113f0d42dc99a2f9fde271bc370d6da1cc39c10
author Andrew Lee <anwlee@google.com> 1424991468 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1424991469 +0000

Merge "Rename DisplayOptions to DisplayOptionsSettings."