summaryrefslogtreecommitdiff
path: root/tools/aapt2/Resource_test.cpp
diff options
context:
space:
mode:
authorKevin Gabayan <gabayan@google.com>2016-07-13 00:27:14 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-07-13 00:27:14 +0000
commitef759ca10ea80e13212bc16b32b192b389eb6adb (patch)
tree9be7767582b023d896235d205b0ac26ca3b4cb8b /tools/aapt2/Resource_test.cpp
parentf7d96e55573b8f45af2100466efcd833a4c46cfc (diff)
parent33759a993d2b404bbcd5079d549ee443cdc03bd8 (diff)
Merge \"Wakelock timeout for AnyMotionDetector. Bug: 29959125\" into nyc-mr1-dev
am: 33759a993d Change-Id: I9ca9b5835b0fbddca4447fcb8e6fc606880bf69e
Diffstat (limited to 'tools/aapt2/Resource_test.cpp')
0 files changed, 0 insertions, 0 deletions