tree 241cb02467e22336716d8b25d5304f2e1af11b23
parent 3d9793633e2a5077735b283a20ae826641a6af31
parent 58221178ccc0ca2336dea1ee290600649d8f95f9
author Jean-Michel Trivi <jmtrivi@google.com> 1546038707 -0800
committer android-build-merger <android-build-merger@google.com> 1546038707 -0800

Merge "Extend PS concealment/error treatment"
am: 58221178cc

Change-Id: I6f810d8e9734607abc6a9d520959edc53fdf17d6