OSDN Git Service

Merge \"Unhiding DEVICE_NAME\" into nyc-mr1-dev
authorDmitri Plotnikov <dplotnikov@google.com>
Fri, 24 Jun 2016 00:32:44 +0000 (00:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 24 Jun 2016 00:32:44 +0000 (00:32 +0000)
commit89858c58af8ed0c606f2f03bcd1dea9a1afa9e8b
tree63af41e1ef9df6627ae6ae629bf25127391d3863
parent43fc5fbd7594023dda4022f8ef60459ed9ecf90a
parentb1ca092db8766c8819f0c99feede8c8d63907ad5
Merge \"Unhiding DEVICE_NAME\" into nyc-mr1-dev
am: b1ca092db8

Change-Id: Icdb1cef5802c4d2b22292874ab3139a132fe7bd0
api/current.txt
api/system-current.txt
api/test-current.txt
core/java/android/provider/Settings.java