tree 395c85a1c48ec6f7e9241303d541f791bb3d0a1f
parent 14b2f1aebbf90b9d17e6f078240d116ced00e348
parent e4176ca234641a1723e9165bae92173da37faa61
author Michele Berionne <mberionne@google.com> 1544643385 -0800
committer android-build-merger <android-build-merger@google.com> 1544643385 -0800

Merge "Remove @hide annotation from KEY_CARRIER_CONFIG_VERSION_STRING" am: ac9e1f5580
am: e4176ca234

Change-Id: Idf096efcf9e5301e006cd144f3c31d7c5b5d670d