tree 90feda1f03b15b3eac033d2debc03cb428ef71bd
parent 0bb18995dc8c3ede6d2ee54f9e4790074f57fa4f
parent 44b19140009a392b31a1f8bd1e2706a20799eb0d
author Remi NGUYEN VAN <reminv@google.com> 1530243845 -0700
committer android-build-merger <android-build-merger@google.com> 1530243845 -0700

[automerger skipped] Merge "Disable hidden API checks on unit tests" am: 855f0f03e1  -s ours
am: 44b1914000  -s ours

Change-Id: Id6a4bb03399d46a9e709cc13e6e338d884c3b87b