diff options
| author | Hiroki Yamamoto <hiroki.a.yamamoto@sony.com> | 2017-07-06 18:47:09 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-06 18:47:09 +0000 |
| commit | 0d6e0cb77e806feb704d88809aed6d8794c54290 (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: Ie16f4282d3881bc7f306d55aacc7c9f0585a1be0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions