diff options
| author | Selim Cinek <cinek@google.com> | 2016-11-09 23:19:25 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-09 23:19:25 +0000 |
| commit | aaa70f5d3767d31cfac80901a38df657a9779cff (patch) | |
| tree | 40fdeba2e4f9f50786090e4bd94f2a8122fccf78 /tools/aapt2/diff/Diff.cpp | |
| parent | 00b6a1ddedda2c5f3bda7ca4ca219eaa9cde91fd (diff) | |
| parent | 6a6bc370e9cb110944cde9bc632482dde2288743 (diff) | |
Merge "Fixed a bug with the emergency affordance in multi user" into nyc-mr2-dev
am: 6a6bc370e9
Change-Id: Iae4342afea01390f6b2567832f863881907dacb0
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions