tree 69d66c2241a971c65468ea38a0540b4ca0e7c6c6
parent eb2b399ce913e42a4b2584f1ee3c3ef235c69e0e
parent 975335db321ccf2f0f6c4a6ff76525816644c96e
author Daniel Xie <dxie@google.com> 1447812273 +0000
committer android-build-merger <android-build-merger@google.com> 1447812273 +0000

Merge "Don\'t run Wifi scan timestamp tests when location is turned off." into marshmallow-cts-dev am: 57031aa47e am: 3f0866e144 am: 9bfb43c08f am: 3b7e1623b3 am: df3a267558
am: 975335db32

* commit '975335db321ccf2f0f6c4a6ff76525816644c96e':