diff options
| author | Greg Plesur <plesur@google.com> | 2016-11-03 20:37:33 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-03 20:37:33 +0000 |
| commit | c33f83c13c64e8830f1d1bf6b1dc37ef3f11826d (patch) | |
| tree | 32fca62cfb69a93b0cf68a118dace4a67a4e4d1b /tools/aapt2/diff/Diff.cpp | |
| parent | 794e66cfd270c4ab5ab2db614f6561c1e48316ba (diff) | |
| parent | 0cbe2e1a5c8c708054ea37588f3bb7b91089e604 (diff) | |
Merge "New Wear devices need to update their DISABLE_LOCKSCREEN_KEY." into cw-f-dev am: 343dbac2e0 am: c447d9ef6a
am: 0cbe2e1a5c
Change-Id: I98803fd185b5d523e5aec610d29c112ee78a6254
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions