tree edbecc05ae1c29ac75fa2ca68ac947214b25fc25
parent 3d317cabbef408ceb4a7dc78a822299fe1569355
parent 4cc4bb070ad0b88d8877d8aa545fe0463f578d59
author Android Build Merger (Role) <android-build-merger@google.com> 1502671294 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1502671294 +0000

Merge "DO NOT MERGE Remove window obscurement information. am: 5508ca2c19 am: 3847972ad2 am: cd71708eca am: 88855f8de7 am: 41f75ecb79  -s ours am: d0cd82abe9 am: 3a0e3d6a81" into oc-dr1-dev-plus-aosp