| commit | aae2845e3b8ac1aa26a1c45485a1510f5b281d9e | [log] [tgz] |
|---|---|---|
| author | Tina Zhou <tinazh@google.com> | Thu Mar 16 23:00:27 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Mar 16 23:00:27 2017 +0000 |
| tree | 382702f79c6d8a28bb736bcb75623c023fa48b84 | |
| parent | ed5d9c96c5418c502120cf11856e2b0ce611400a [diff] | |
| parent | 49a093c3a192c80e2b8d020b2eba6b828e68741f [diff] |
Merge "Merge "Merge "DO NOT MERGE: LocationManagerTest runs on devices that don't have a GPS provider" into marshmallow-cts-dev am: 1abb2f0433 -s ours" into nougat-cts-dev am: 1ba0d96b69 -s ours" into nougat-mr1-cts-dev am: 49a093c3a1 -s ours Change-Id: Ic98a82951c89d89353f3f544798e09ef02c83a4d