diff options
| author | Hiroki Yamamoto <hiroki.a.yamamoto@sony.com> | 2017-07-06 02:04:52 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-06 02:04:52 +0000 |
| commit | 57e528f8ea41238d1bc8841646d4b803a8f3dbeb (patch) | |
| tree | d844ad2720314e17a185e21a5d90750522b9152e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | c8953e6edf315280c2bc1ea42adc1a99aa2f9884 (diff) | |
| parent | 808ae634dd17f7c7093ade11375ab06918beb41e (diff) | |
Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am: 21187ba5cc am: 1a6d0d753e" into oc-dev-plus-aosp
am: 808ae634dd
Change-Id: I1e9c347aa7b3722cda19d1c6f3ec34adb93ea08c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions