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