commit | f92b00722d84fa0caea25a3363242b6dced0635c | [log] [tgz] |
---|---|---|
author | Vinit Deshapnde <vinitd@google.com> | Thu Mar 20 19:31:42 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 20 19:31:42 2014 +0000 |
tree | fd0d83d50924fe5ec4edd1d446825bd757c82775 | |
parent | 826f3647a4a44ffcf154c63fe204a7787b96a657 [diff] | |
parent | 52bc363cf3a7de8431cfbb370f0fd3adeecaed52 [diff] |
am 52bc363c: Merge "DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns" into klp-dev * commit '52bc363cf3a7de8431cfbb370f0fd3adeecaed52': DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns