tree 216edd19efbc9784e8b7c2b39e0b82d380ffdafd
parent 0a9b04a6faf4501cb9d4ccf877f66aae85992df8
parent b000ae8707d57c2ca0907b16456efd100b34a64e
author Calvin Pan <calvinpan@google.com> 1545359599 -0800
committer android-build-merger <android-build-merger@google.com> 1545359599 -0800

Merge "Public SIM_APN_URI uri and deprecated mcc, mnc, mvno_type, mvno_data" am: d839b0d384 am: faf8c714b7
am: b000ae8707

Change-Id: I0fe486b37521df918120cca1233d299ec68ce84b