tree 2d0ace6ff30d9673d0dfa32be0380cd3f30ed329
parent a92bcc33b28c53883e902db03c578c1edaf84f0d
parent 03dafac4957918c85ca2c971d24c4d9ab80890a3
author nharold <nharold@google.com> 1516172379 +0000
committer android-build-merger <android-build-merger@google.com> 1516172379 +0000

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

Change-Id: I3c0e13153a347e6ef79cfee9f00a6ee6694425d9