OSDN Git Service

Merge changes I902b2816,I284d421e
authorTreeHugger Robot <treehugger-gerrit@google.com>
Fri, 22 Dec 2017 13:32:15 +0000 (13:32 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 22 Dec 2017 13:32:15 +0000 (13:32 +0000)
* changes:
  Add DISALLOW_AIRPLANE_MODE.
  Add DISALLOW_CONFIG_LOCATION_MODE.

1  2 
api/current.txt

diff --cc api/current.txt
Simple merge