summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorPaul Jensen <pauljensen@google.com>2015-01-10 02:08:59 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-01-10 02:08:59 +0000
commit2a41b761866f12f67fdf50efb76dd72e403ff1c2 (patch)
tree1cc081936c58866df47340584596a2df14402943 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent2a7991ee2f331c242ff9f7b87058e64b50a616fd (diff)
parent63e2b8e058f379582d0325aa84b5de6bfa73e15b (diff)
am 60944390: Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev
automerge: 63e2b8e * commit '63e2b8e058f379582d0325aa84b5de6bfa73e15b': Remember to cancel lingering when a network again satsifies a NetworkRequest.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions