OSDN Git Service

Merge "Load regulatory info from /data/misc" into oc-dr1-dev am: f964e8c3b2
authorFan Zhang <zhfan@google.com>
Fri, 23 Jun 2017 01:47:45 +0000 (01:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Jun 2017 01:47:45 +0000 (01:47 +0000)
am: 9f7227eb59

Change-Id: I2421dba06e793b62ed3abb2dde041b8d0e1f0d29


Trivial merge