tree f093da93b49eec5f3f3a6778526e7efda222a286
parent 18ee8219aaaae0c93e3696e1ae66e0f692756d8c
parent 589db3a4b38d36bafed4c36423008ee060db4366
author roldenburg <roldenburg@google.com> 1507580252 +0000
committer android-build-merger <android-build-merger@google.com> 1507580252 +0000

Merge "Partial revert of cl/170369554 to fix video call ringing screen"
am: 589db3a4b3

Change-Id: I36fd15a3ccf7fb43019f40519fbae58ae9f8cfa0