summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAdrian Roos <roosa@google.com>2017-06-30 21:22:16 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-06-30 21:22:16 +0000
commit29f38676eb4141704d339457bdb2399bd4124296 (patch)
tree83046e40da738af34cfced9e48ffbfa650a398a1 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent8626cd184b8448d52ead6b9562db0ef6bfea0718 (diff)
parent6023ccbea1568d8b22db82cac9bf7a03367d0a61 (diff)
Merge changes Ifa407b84,Iff84c019 into oc-dr1-dev
* changes: AOD: Add hysteresis to pausing the display Factor out AlarmTimeout
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions