commit | 766643750aa1536efb4cf0240547db4df540514c | [log] [tgz] |
---|---|---|
author | Doris Ling <dling@google.com> | Thu Apr 06 17:20:21 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Apr 06 17:20:21 2017 +0000 |
tree | b486254f91e325af332ed91bbd3975e26c0853ca | |
parent | fbf21f4c857a87a27f19203975c882cf29a59d1a [diff] | |
parent | 5221d1cd0afb9cb1392beca07863beb9aaa4219b [diff] |
Merge "Re-order the display settings items." into oc-dev am: 5a03e321bc am: 5221d1cd0a Change-Id: Icabaab149f5fbe5d816cd7b8d440ff5593fa4e3b