tree 79b5673297b8a16b80f69d29eddbe6143e314211
parent e0a27e855bc22f99618aeca09737c344237deb26
parent 4e7407a80ec46ec4c132af088f779d519b33041a
author Jorim Jaggi <jjaggi@google.com> 1476455088 +0000
committer android-build-merger <android-build-merger@google.com> 1476455088 +0000

Merge "Fix split-screen flash issue" am: 6738617652 am: f1fed4de21
am: 4e7407a80e

Change-Id: Ibfef3bd01a54cca64a2f0de197bd9480a7539cd0