Merge changes from topic "am-98b9de0e504e4878968b66aca8c6c1d7" into udc-d1-dev-plus-aosp
* changes: [automerger skipped] Merge "Revert "Back up the smooth display setting"" into udc-dev am:060a56468d
-s ours am:028c16242d
-s ours [automerger skipped] Revert "Back up the smooth display setting" am:eef23f441c
-s ours am:2471b9f543
-s ours
This commit is contained in:
committed by
Android (Google) Code Review
commit
61f7877e19