tree 3e53df379dd6fa4f9d95c34e6e6b9f9951288892
parent a6e5c711e68eea517e7738cb7b75de688f9de92f
parent bc295f2a890c22b4a97615e9225d4d8d480228d9
author fionaxu <fionaxu@google.com> 1516153056 +0000
committer android-build-merger <android-build-merger@google.com> 1516153056 +0000

Merge "drop the latest carrier id table in text format" am: 53cb6aa35a am: 9ac8a9ad1d
am: bc295f2a89

Change-Id: I6114f0a1465810c5d29b687c1b0c785c631ebc45