diff options
| author | Wei Wang <weiwa@google.com> | 2017-07-29 03:20:03 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-29 03:20:03 +0000 |
| commit | 616548b406b4c7fb825c0adfe1efb11ae3ecc54d (patch) | |
| tree | 6517ce26aa05f4be50f7eb6c0206dcb7add31e2e /tests/DynamicCodeLoggerIntegrationTests/src/cpp/test_executable.cpp | |
| parent | 085c3f0b47d6b64ec9492059f70017cc37e29e0a (diff) | |
| parent | ac712366a966a22d13047101ff57e9f7ee5dfc0a (diff) | |
Merge "DO NOT MERGE ANYWHERE: Add a wakelock timeout when downloading xtra data for GNSS. am: a763fdba09 -s ours am: 452b8f2bd3 -s ours am: f173b2a4c3 -s ours am: 43712e248c -s ours" into oc-dr1-dev-plus-aosp
am: ac712366a9 -s ours
Change-Id: Iaf0e370abcdec3c8517033116e4d8bc354f41133
Diffstat (limited to 'tests/DynamicCodeLoggerIntegrationTests/src/cpp/test_executable.cpp')
0 files changed, 0 insertions, 0 deletions