tree b7456a1966eb7e6e10195cd6ee6af343749e17f3
parent d63a259aa98e0b7a28e381749dbc03eddb618874
parent 48306e0a06586fe76c4177ffb96adb1339a43b3f
author nharold <nharold@google.com> 1516172874 +0000
committer android-build-merger <android-build-merger@google.com> 1516172874 +0000

Merge "Update documentation for KEY_CARRIER_NAME_STRING" am: fa6187510a am: 03dafac495
am: 48306e0a06

Change-Id: I6c73af383295d0c53e2b3451d61cfccb1ba2a441