| commit | fca5722d6423394ba0cb8d856d2ce03589be4ced | [log] [tgz] |
|---|---|---|
| author | Yuhao Zheng <yuhaozheng@google.com> | Mon Apr 28 16:44:53 2014 -0700 |
| committer | Yuhao Zheng <yuhaozheng@google.com> | Mon Apr 28 16:53:13 2014 -0700 |
| tree | abb6efbb06e7a5bbcb824b8afe092a900f91d807 | |
| parent | b9519955b0fcf6a750c93dacc07ce147ab0cba34 [diff] |
Revert "manta: Set default locale to US" Manually merge ag/451386 from klp-dev to master. Resolving merge conflict caused by previous enabling DFS channels on master. After this change, the locale will have both DFS channels and channel 12/13. Bug: 13894807 Change-Id: Iea1deb8858333b34a93e44a51bc53013cbee53b4