tree 4ab0af50b1fee66732de0f6f6d2375b16daa704c
parent a5abb4a71155b30c1e960a4da71b94266df26c91
parent eda9958c6d0ed43f10b856cb71a4d634d0130ec7
author Michele Berionne <mberionne@google.com> 1544644001 -0800
committer android-build-merger <android-build-merger@google.com> 1544644001 -0800

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

Change-Id: Ief7fe2af1bc4bbf6b6028d5a801c1929c5f7a3a6