diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2017-07-06 01:53:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-07-06 01:53:59 +0000 |
| commit | 808ae634dd17f7c7093ade11375ab06918beb41e (patch) | |
| tree | db4efb4ce25452ae0c9bda17f4f35f8661febfa6 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 3ccfa356679b21b9df046fcf829b1ab2ec09451c (diff) | |
| parent | 5a9226ffd48b01a5c6993666e188731bc8a01a66 (diff) | |
Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am: 21187ba5cc am: 1a6d0d753e" into oc-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions