diff options
| author | Chen Xu <fionaxu@google.com> | 2019-12-14 04:16:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-12-14 04:16:54 +0000 |
| commit | b25174e9d0697e20ab1a89f763d2fccf74a38492 (patch) | |
| tree | 3a8b5dea3b318c8b29d7403461f322375ecb3f28 /tools/aapt2/diff/Diff.cpp | |
| parent | fd5241f12001b7e5cb5ec8472c2808ffbbdabf69 (diff) | |
| parent | 4c0941420e798b7916799cc381191e173564ed05 (diff) | |
Merge changes from topic "cpcpcp"
* changes:
move encodeException to non-updatable framework/base/telephony/common
move IApnSourceService.aidl to android.service.carrier
use SmsCbMessage.MESSAGE_FORMAT_3GPP to replace hidden SmsMgr APIs
apply correct @SystemAPI for PackageManager
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions