OSDN Git Service

Merge "Unhiding DEVICE_NAME" into nyc-mr1-dev
authorDmitri Plotnikov <dplotnikov@google.com>
Fri, 24 Jun 2016 00:23:12 +0000 (00:23 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 24 Jun 2016 00:23:13 +0000 (00:23 +0000)
1  2 
api/current.txt
api/system-current.txt
api/test-current.txt
core/java/android/provider/Settings.java

diff --cc api/current.txt
Simple merge
Simple merge
Simple merge