diff options
| author | Hiroki Yamamoto <hiroki.a.yamamoto@sony.com> | 2017-07-06 18:46:41 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-06 18:46:41 +0000 |
| commit | 6e6b4f713f3b3404e8f7a812266d4e4b4888a502 (patch) | |
| tree | 960a3f3cf0b2530bd56105b7e839de99324b33ff /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | f888e4248a32febd64feb6ea3fbeab5b3e0b0507 (diff) | |
| parent | f259a1975bf45737f10ff6fd00e090d92c1f50c3 (diff) | |
Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" into oc-dr1-dev
am: f259a1975b
Change-Id: I89bc4bb9469a1bd316eabe22abaf7ee2c10fc02c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions