| commit | ac712366a966a22d13047101ff57e9f7ee5dfc0a | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Sat Jul 29 03:13:30 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Sat Jul 29 03:13:30 2017 +0000 |
| tree | 38433d09297b2e56c5b5b897f280e41f96ea6213 | |
| parent | 111969fb334de24819d9016a3f489c9d66eda94b [diff] | |
| parent | eeb195b873dfaf4b71c1b520efe43099bca5aa6e [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