diff options
| author | Hall Liu <hallliu@google.com> | 2017-02-15 22:30:44 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-15 22:30:44 +0000 |
| commit | 38f5001c10aa6e6d911ba0977b38f623a9744f5b (patch) | |
| tree | 28dc40069030010030dd93c52b794224d6043584 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | d4a847495e9ca065d472cd9e17b1e2b47bf6a910 (diff) | |
| parent | 2bc24e252ecd1691398550b8112bd5bb2c303746 (diff) | |
Merge "Add extra key for app-specified outgoing call timeout" am: decc6c9d56
am: 2bc24e252e
Change-Id: I1912bfa8856e78f375587d94bf589ef2fd25bee8
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions