tree 3bb7a030e9ea5fe608286265776eb111c91a4ab7
parent b02ffa5f10d7f1a1d6df01f585fd5726945da62a
parent f3df0aaa326538085adc8aca35a3eaff85ab3c70
author Jorim Jaggi <jjaggi@google.com> 1459988545 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1459988546 +0000

Merge "Fix flicker when docking task" into nyc-dev