tree d30680d22f9362960ee4dad0abe4f7b60d4cb3ad
parent f44b9b40417bc10ecb939e93cd2ba7e746839015
parent e743aeb9229760e041eb5096f8e15a8187658850
author PO HUNG CHEN <howardsoc@google.com> 1559096469 -0700
committer android-build-merger <android-build-merger@google.com> 1559096469 -0700

Merge "Fix StrictModeTest#testNonSdkApiUsage" into qt-dev am: 4f179bb174
am: e743aeb922

Change-Id: Ice5fc23658245af695a38ac8aebfa5230ebc138c