OSDN Git Service

Merge "DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns...
authorVinit Deshapnde <vinitd@google.com>
Thu, 20 Mar 2014 19:26:44 +0000 (19:26 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 20 Mar 2014 19:26:44 +0000 (19:26 +0000)

Trivial merge