diff options
author | Zach Johnson <zachoverflow@google.com> | 2020-05-27 04:17:32 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-27 04:17:32 +0000 |
commit | bdd720e4f45c881cb77d88d729fb9c1b2f0255f4 (patch) | |
tree | a821fc98a953e0486419544e93f283926041fd23 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 53ea003df25aedc01e597dfe7d8e88a7a1d6d02d (diff) | |
parent | 24f591c22dc667f7933d90a4428807cb7925ad37 (diff) |
[automerger skipped] Merge "Add NAMESPACE_BLUETOOTH for bluetooth feature experiments" am: 6a67acaaf3 am: 24f591c22d -s ours
am skip reason: Change-Id I330b8cc5aeb14ebcc15fb88c605ac72770497040 with SHA-1 1eec532a8e is in history
Change-Id: I7bf1fc161344fecab26783b1705d5e90011f1548
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions