| commit | 18588d358994e7bf8a60e47dbc896a2066592a70 | [log] [tgz] |
|---|---|---|
| author | Tina Zhou <tinazh@google.com> | Thu Mar 16 22:24:16 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Mar 16 22:24:16 2017 +0000 |
| tree | 37fc8d601b35d0549389b9e0203e63157716d3e2 | |
| parent | 3ae817f402437f4c08a7811a81592573ca11c96b [diff] | |
| parent | 8d04189fb2e22fb34717f66e8af42d3cc124b962 [diff] |
Merge "Merge "DO NOT MERGE: CTS test for mock location exploit" into lollipop-mr1-cts-dev am: a895fbe836 -s ours" into marshmallow-cts-dev am: 8d04189fb2 -s ours Change-Id: Ia2a86fe49a86bc849a825d633c832519c32fe51b