| commit | 614fd1b51bf8576271238acf4e5a7baf82f4e4bd | [log] [tgz] |
|---|---|---|
| author | Yan Yan <evitayan@google.com> | Fri Jan 10 00:23:28 2020 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Jan 10 00:23:28 2020 +0000 |
| tree | e28f228526802286ea25d5b56b6ac322abea9f3d | |
| parent | 95a2c736e97d2b89298e65714f193b31410d1278 [diff] | |
| parent | 996aa2a14627bc90c110e5af68e0f4854db516e8 [diff] |
Merge changes from topic "include-uiccapptype" * changes: Make mainline IPsec(IKE) to statically include @UiccAppType move UiccAppType to annotation class