diff options
| author | Wei Wang <weiwa@google.com> | 2017-07-29 03:30:58 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-29 03:30:58 +0000 |
| commit | 7c3be60728105f896c9247811a1f59bc40e6e837 (patch) | |
| tree | 1b72857b64393f92a1680c3d8e1f5e5f228d7fbc /tests/DynamicCodeLoggerIntegrationTests/src/cpp/test_executable.cpp | |
| parent | 1a5f74080ba62a1bb89b9af5c40aa38c48c81ba2 (diff) | |
| parent | 568771cf293bba591f3297f04c63c183f6818176 (diff) | |
Merge "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" into oc-mr1-dev-plus-aosp
am: 568771cf29 -s ours
Change-Id: I0cfe84a914212a6771c9fbad0acb3976de7d9f2b
Diffstat (limited to 'tests/DynamicCodeLoggerIntegrationTests/src/cpp/test_executable.cpp')
0 files changed, 0 insertions, 0 deletions