summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorNeil Fuller <nfuller@google.com>2018-06-12 21:15:22 +0100
committerNeil Fuller <nfuller@google.com>2018-06-12 21:15:22 +0100
commit8665cf17cc915222af3d7499b94a4343b3b4c254 (patch)
tree3a514575c61b890f714859eee554a98be5d9e81e /tools/aapt2/java/JavaClassGenerator_test.cpp
parent24836bfb1564b1f98c322108a924965a8dbbee4f (diff)
Keep internal/aosp code in sync
SystemClock.elapsedRealtimeClock() could not be used in aosp/master when the code was cherry-picked outside. The method is also marked as @Removed. This change makes the goog/master code the same as aosp/master code to avoid conflicts in future. Bug: 78217059 Test: build Change-Id: Iaa68baf71f9339705b0a7db00cbcdc6da512b79b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions