diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2016-12-14 04:59:54 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-12-14 04:59:54 +0000 |
| commit | bf21458740cfec1edd1751a1afb7315cea5ba4bf (patch) | |
| tree | e6efb2cc74394d8b85213420d47ae9c2ff6bd6c6 /tools/aapt2/diff/Diff.cpp | |
| parent | 38938279a4290e7d724369cea4220bc0073d62fb (diff) | |
| parent | 5625d486b9a4eb602b13f6f2d261f1a27126b9b9 (diff) | |
Merge "Display "Sign into network" in settings when on a captive portal." into nyc-mr2-dev
am: 5625d486b9
Change-Id: Iaec556477328fdf5e5f304a456c8942bca11592a
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions