diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-03-24 18:57:34 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-24 18:57:34 +0000 |
commit | 5e18c2101eaaafd717425b698364c0327713accc (patch) | |
tree | c5b70492a06c39203a12ac306ac469d55d7b3f2d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | abba59c47a627610cb1c4ee040dee2ac8bb0a5dd (diff) | |
parent | 90e1746fe19214e3282594def2a6b72c9735227c (diff) |
[automerger skipped] Merge "Move BLOCKED_REASON_* constants from NPMS into ConnectivityManager." am: 8c03c2a82e am: 13b4d67d40 am: 90e1746fe1 -s ours
am skip reason: skip tag Change-Id I4c544415e12adf442fd2415c371b1b70a39c3aa4 with SHA-1 2e20a1a29e is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1651532
Change-Id: If0f92d490fc903ba2037766a69365eb44af8027e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions