| commit | 125794f1b9b6e18b17284d915eb549fed12fdeae | [log] [tgz] |
|---|---|---|
| author | Jordan Liu <jminjie@google.com> | Mon Jun 04 11:51:48 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jun 04 11:51:48 2018 -0700 |
| tree | ea4a592deedbf5b8b7134669f8eaf89fe4bcb151 | |
| parent | b2418a03ff425469e3dd395bfb3665a712d4d0b2 [diff] | |
| parent | d9c45951d87f04ef202189fa127a29c04be48fb2 [diff] |
[automerger skipped] Merge "Use resource instead of carrier config" am: 78ba85cdd7 am: d9c45951d8 -s ours Change-Id: Ic8fbef5fc5e829388f8b50fbd118042331716cf6