summaryrefslogtreecommitdiff
path: root/java/java_test.go
diff options
context:
space:
mode:
author Jiyong Park <jiyong@google.com> 2020-04-29 22:34:13 +0900
committer Jiyong Park <jiyong@google.com> 2020-05-25 17:05:35 +0900
commit8b39919030cabd08dcd734bd518d810f32e660b9 (patch)
tree818f34a6752c0f10cdf28f81344bc9040988b8c8 /java/java_test.go
parent1834358aa5bd3fc726ef09182734004f9fd9cb37 (diff)
DO NOT MERGE: Revert "DO NOT MERGE: Remove AppSearch from Android R."
This reverts commit c9c7116721b38d3389d654a2f73d116882f7323a. This revert is to avoid merge conflict when ag/11299431 is auto-merged to master. This change will again be reverted when ag/11299431 lands. Bug: 150999716 Test: m Change-Id: Ia0f7a0e0eb8cf6f6f4d0693de01777a8a750c769
Diffstat (limited to 'java/java_test.go')
0 files changed, 0 insertions, 0 deletions