diff options
| author | Greg Plesur <plesur@google.com> | 2016-11-03 20:23:29 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-03 20:23:29 +0000 |
| commit | c447d9ef6a6932f6abdddc3aa6e59cf92792372b (patch) | |
| tree | a5cc9dc1a8ab255334bfc09177fc8d6e969ccbf0 /tools/aapt2/diff/Diff.cpp | |
| parent | a71a0b8da1f8ebaf0d4b4618a1848d28e8d9c1c9 (diff) | |
| parent | 343dbac2e0519f0dda41eb9337957b35f53098a9 (diff) | |
Merge "New Wear devices need to update their DISABLE_LOCKSCREEN_KEY." into cw-f-dev
am: 343dbac2e0
Change-Id: Ia7b6297443c555edc9372e6991784b2a6920d2ba
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions