summaryrefslogtreecommitdiff
path: root/tools/aapt2/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorChristopher Tate <ctate@google.com>2015-03-16 16:55:14 -0700
committerChristopher Tate <ctate@google.com>2015-03-16 17:39:07 -0700
commit2d4aadca9487d76cb7220bdba90afa53119664ea (patch)
treec332c59f9cb2263aef59f1216995de0eba196afa /tools/aapt2/JavaClassGenerator_test.cpp
parent6597e3435f8abfedbb9a4f1bfb10cc17ea7f38bf (diff)
Merge restored accessibility enable state, don't overwrite
We do not want to accidentally disable the user's currently-enabled accessibility service(s); presumably they turned them on during setup for a reason. We now merge the prior + current states rather than simply replacing the current state with the former. Bug 19427367 Change-Id: I96eb47df57318c88066c5da6862f23f656639148
Diffstat (limited to 'tools/aapt2/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions