summaryrefslogtreecommitdiff
path: root/core/jni/AndroidRuntime.cpp
diff options
context:
space:
mode:
authorChalard Jean <jchalard@google.com>2020-02-21 11:06:55 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-02-21 11:06:55 +0000
commit94fa6dc345ca7bc427caa66c93ae7595c3eeab3e (patch)
treef2c9beb231c0233c811a21325be7d219bdd63e2e /core/jni/AndroidRuntime.cpp
parent358a2d2c99846698253521851a397708002f27d5 (diff)
parent96726bcbb9cd58a3e3c214154c1f1e52f545006c (diff)
Merge changes Ia91b3b3c,Id9ecdac5,I4b17d1b1
* changes: Revert "[NS D01] Remove candidates that don't satisfy the request." Revert "[NS D02] Mix in the ignore on wifi policy." Revert "Address comments on ag/10316753"
Diffstat (limited to 'core/jni/AndroidRuntime.cpp')
0 files changed, 0 insertions, 0 deletions