diff options
| author | Michal Karpinski <mkarpinski@google.com> | 2016-10-13 22:52:41 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-10-13 22:52:41 +0000 |
| commit | 949a485e29450700495b3ccdac475beed2527ab5 (patch) | |
| tree | 4be4c46d7f3acc232ad42b7980a73889f3146ce3 /tools/aapt2/diff/Diff.cpp | |
| parent | bc755da55cc00110a3c77b013c350a9b62c1f1cd (diff) | |
| parent | a6b3caf58e8ab18f4c3164afb8fba25e9954198b (diff) | |
Merge "Don't expose default strong auth timeout as constant" into nyc-mr1-dev
am: a6b3caf58e
Change-Id: I9763e78b50a98dcf1139cdc299a8944e94c824d9
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions