tree 0081cbe6c2933344bb47306ec0e16d8d858f5e12
parent 9cbd418f98243f0922ca1bfe509dd7bbe9c9ddc3
parent f54c73ceb45156b062e20736aed525ba42155132
author Neil Fuller <nfuller@google.com> 1568015795 -0700
committer android-build-merger <android-build-merger@google.com> 1568015795 -0700

[automerger skipped] Merge "N Backport: Add a regression test for bug 118835133" into nougat-cts-dev
am: f54c73ceb4 -s ours
am skip reason: SHA1 f54c73ceb4 skipped by user nfuller

Change-Id: I572b60905fd2da1eb14de03f58919bf2eb6358dd