diff options
| author | Etan Cohen <etancohen@google.com> | 2017-07-27 18:16:49 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-27 18:16:49 +0000 |
| commit | 8c84e0f75740966d79f892796b263c95fbd36542 (patch) | |
| tree | d2886b2636be90cf4e40a938aa1677e906d6363e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | adfbfeb33a45c29c45e5f66946bfbf01901b5d73 (diff) | |
| parent | 5b81cfe83ce5a5fbcc96ffdcc1b2a986e19b6e33 (diff) | |
Merge "[P2P][AsyncChannel] Revert client registering for service death" into oc-mr1-dev
am: 5b81cfe83c
Change-Id: I45c2d0818657a5c4e8cc35f6ad09f2e7d7f77cea
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions