diff options
author | Winson Chiu <chiuwinson@google.com> | 2020-06-26 18:57:00 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-26 18:57:00 +0000 |
commit | b6670ad8ec7bf6edd9c1f20d358aae9dddbcb10b (patch) | |
tree | 14b0c42cc84b8516f986c2d2156953d679902ae9 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 34ed9dd3f04b0787c7a0853200c1ae8ac41e33f6 (diff) | |
parent | 4376a307fce69cd8f8209104eb3d08d24d88e624 (diff) |
[automerger skipped] Merge "Revert "Ignores protected broadcasts if not priv-app"" into qt-dev am: f63adb20f6 -s ours am: 4376a307fc -s ours
am skip reason: Change-Id I54d236c0a6daaa934bd64a3bd05e2654e0e868fe with SHA-1 860fd4b6a2 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11886042
Change-Id: I3b0752328b77c2c8efffe4bb0dabba8a58d19916
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions