diff options
| author | Hall Liu <hallliu@google.com> | 2017-02-16 01:59:13 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-16 01:59:13 +0000 |
| commit | 7ff09b3024ba8c9d416a8f1fd2977cbc3648e880 (patch) | |
| tree | 7b916ef23e7ce28160107217c81f7ba6656c3d63 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 634733e42e66db0572ad00e56efe71db79f3f879 (diff) | |
| parent | dbf6f9263d5e2fd44f4e9ebd7831712014ad8178 (diff) | |
Merge "Add extra key for app-specified outgoing call timeout" into nyc-mr2-dev am: 4d3435637f -s ours
am: dbf6f9263d -s ours
Change-Id: I403da9dbf4c9cd9f1e9a69f7152bba4832b734e7
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions