summaryrefslogtreecommitdiff
path: root/tests/DynamicCodeLoggerIntegrationTests/src/cpp/test_executable.cpp
diff options
context:
space:
mode:
authorSuprabh Shukla <suprabh@google.com>2017-02-03 01:43:34 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-02-03 01:43:34 +0000
commit5766f6c8ab84f5ae69b52e4c813086617e4e6778 (patch)
treeaef533a7423ca0fa4e494d170e0b5556ae831606 /tests/DynamicCodeLoggerIntegrationTests/src/cpp/test_executable.cpp
parentb07152d9cc2e538eaf27f79d210a676d45f45ab3 (diff)
parentd11c7025cd0a294cd767fe3a744676f6c0cb451e (diff)
Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1-dev am: 3ced78bdda am: aec526f710 -s ours am: 14e38a8b21 am: 429683b469 am: ceb288f00b am: 5acc268372 -s ours am: ea91d2d0cc am: 73d19fc1a0 am: 5a2e7e2e58 am: b2cdb4e2dd am: cb84f799ff
am: d11c7025cd -s ours Change-Id: Iafd344132d85ea68c337aea9b9f746a7e151b0b2
Diffstat (limited to 'tests/DynamicCodeLoggerIntegrationTests/src/cpp/test_executable.cpp')
0 files changed, 0 insertions, 0 deletions