diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-02-06 03:50:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-02-06 03:50:18 +0000 |
| commit | e484fe322eeda50464e3ac43e637e40257ca65f9 (patch) | |
| tree | 15fadbe51ed1e8ab8154a4ee1f43593121ee6503 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 7ff8eb9c5e85b61ab71458155f86f1899eecb9be (diff) | |
| parent | 80349e0ce3e8dacd0e7e981ddad9a1e83ebf6802 (diff) | |
Merge changes from topic "am-f03a20d785824cb5973391e78d6c1eb2"
* changes:
Merge changes from topic "ims_apis" am: de65acb915 am: 77230a0b3f am: 83d77063a8 -s ours
Make ImsService API @SystemApi am: 0e370b4a02 am: a690700bca am: ade4691364 -s ours
Integrate new MMTel APIs into the framework am: 5b1883b5f1 am: e904f40820 am: a210f34020 -s ours
Integrate ImsCallSessionListener API changes am: 6ed4ee6847 am: d627bb5039 am: 2c5dc6b6a0 -s ours
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions