summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/AnnotationProcessor_test.cpp
diff options
context:
space:
mode:
authorSteven Laver <lavers@google.com>2020-03-10 02:43:56 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2020-03-10 02:43:56 +0000
commita13ebc1059b626bca20efb3da162ed7d0910edc2 (patch)
tree787569f6a88fc776a988c2293e1e3ccee5970db8 /tools/aapt2/java/AnnotationProcessor_test.cpp
parent7a94ee03e4aee391e838005a2b4a090be81d1650 (diff)
parentf4f05d90bda51e27ca2b7611ccc4d8ecbf65cdf4 (diff)
Merge changes from topic "RP1A.200303.001" into r-keystone-qcom-dev
* changes: Merge RP1A.200304.001 Adds a null check in RecentTasks::remove. Disables CloseGuard on SurfaceControl. Re-implements networkClassToString for CarrierTextController. ActivityManagerService::startProcessLocked added zygotePolicyFlags. Merge RP1A.200303.001
Diffstat (limited to 'tools/aapt2/java/AnnotationProcessor_test.cpp')
0 files changed, 0 insertions, 0 deletions