commit | 9cf312db82c1ae70bd433906f2b723f86f60215b | [log] [tgz] |
---|---|---|
author | Sean Wan <swan@google.com> | Sat Apr 18 00:17:03 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Apr 18 00:17:03 2015 +0000 |
tree | 73a07185955a24134a3a59752d5a7bdc7249184d | |
parent | 8c6bbad4a1432197af8798c03f4dd7d62836569c [diff] | |
parent | 527b1d3a06a6665006406a4239a58035642bc418 [diff] |
am 527b1d3a: (-s ours) am d1a72651: am b792f433: Merge "DO NOT MERGE: Make wifi scan interval when disconnected configurable." into lmp-mr1-modular-dev * commit '527b1d3a06a6665006406a4239a58035642bc418': DO NOT MERGE: Make wifi scan interval when disconnected configurable.