diff options
| author | Hiroki Yamamoto <hiroki.a.yamamoto@sony.com> | 2017-07-06 01:53:01 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-06 01:53:01 +0000 |
| commit | 5a9226ffd48b01a5c6993666e188731bc8a01a66 (patch) | |
| tree | db4efb4ce25452ae0c9bda17f4f35f8661febfa6 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 41d52b1bb2301a0cdddbfc62a7c847fe5e869902 (diff) | |
| parent | 1a6d0d753ef004d8c72ea2a7e5548c7fc8cfbd9a (diff) | |
Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am: 21187ba5cc
am: 1a6d0d753e
Change-Id: I588cd14481ed540dacd85646f52e7b98d1bc58b9
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions