tree 2d49e60c478ea91d66f1b3796b4450564b976ea9
parent 20f0d091f72df85fa764b4d04f75e9d3bf42d537
parent e7cc44d8140dbf8ef1e2736869a4f40c38d57cf3
author Rob Carr <racarr@google.com> 1490221881 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1490221886 +0000

Merge "Amend "Fix various flashes when..." CL"