tree 6263c7d11a377fbf6431f2e261c851d43333d819
parent 105f7dc91b0f77ebad2477e53b3dc6d5ab003ed5
parent 38ea59c4c45ffe0b001a746364129d5ec0db5511
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1518643630 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1518643630 +0000

Merge "Merge "add a current table in CarrierIdProvider" am: 3fa6fe2117 am: 9fce67f50f am: ddf41d99f3  -s ours"