commit | f0f4058c6a1d1b41f90e94593ebf306f9e2b8b89 | [log] [tgz] |
---|---|---|
author | Vinit Deshpande <vinitd@google.com> | Wed Sep 03 14:33:41 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 03 14:33:41 2014 +0000 |
tree | 97b8087c4e58a94973469287ff6e58ab32d697b5 | |
parent | edaf5a2681d2518399587a4344ceb5b6a9171c38 [diff] | |
parent | c400ae685fb189a427ba1c8865ca7b94e77db135 [diff] |
am f4b970e5: am 2705b859: Merge "Address API Council feedback for WifiAdapter/WPS APIs" into lmp-dev * commit 'f4b970e5fc0204334ff3990ccb47f6323fd68ee7': Address API Council feedback for WifiAdapter/WPS APIs