commit | 69fb9bb5f604d38c8fc4c05d086b8849c4a0bbcd | [log] [tgz] |
---|---|---|
author | Fyodor Kupolov <fkupolov@google.com> | Thu Aug 27 04:49:22 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 04:49:22 2015 +0000 |
tree | 9779095e5a603526d44704c559c820d3628c5ea8 | |
parent | 681838a16848b128bec073451789fd363f53a369 [diff] | |
parent | 7f0df997fe0c44e74a38536bb0f5b414b7ebce92 [diff] |
am 7f0df997: (-s ours) am 6a4d762c: Merge "Fix for ScanResultTest and WifiManagerTest" into mnc-dev * commit '7f0df997fe0c44e74a38536bb0f5b414b7ebce92':