diff options
| author | Hall Liu <hallliu@google.com> | 2017-02-16 01:31:54 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-16 01:31:54 +0000 |
| commit | dbf6f9263d5e2fd44f4e9ebd7831712014ad8178 (patch) | |
| tree | 26a9ced79777cf4ad32b841d1aaf953ffc865f62 /tools/aapt2/diff/Diff.cpp | |
| parent | c475730d2254b34013fc19c0c78791f363ec3708 (diff) | |
| parent | 4d3435637fb929d04c3805613a378becdd45f02e (diff) | |
Merge "Add extra key for app-specified outgoing call timeout" into nyc-mr2-dev
am: 4d3435637f -s ours
Change-Id: I2ed7250a9fb8c5026b209ad5b3384a401b1d4d16
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions