diff options
| author | Michal Karpinski <mkarpinski@google.com> | 2016-10-13 23:01:19 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-10-13 23:01:19 +0000 |
| commit | 736ba34114226dcdca94cf89820a341dbb71ad01 (patch) | |
| tree | 17a7acd050b56f2c4d95c61904e91be9b9730bd9 /tools/aapt2/diff/Diff.cpp | |
| parent | fd0d22750f1747ffb694bfcb77d4686d8fda55c8 (diff) | |
| parent | 949a485e29450700495b3ccdac475beed2527ab5 (diff) | |
Merge "Don't expose default strong auth timeout as constant" into nyc-mr1-dev am: a6b3caf58e
am: 949a485e29
Change-Id: I65369538db700b4b8de7385c57242a5e5b7e922e
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions