summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorRicky Wai <rickywai@google.com>2016-07-07 11:05:54 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-07-07 11:05:55 +0000
commitf32e96a8df8feb53522f73c49f8d1e793c403bcb (patch)
tree92b0311a8eca3674fc98dd389da6b74d8f4f1bca /tools/aapt2/diff/Diff.cpp
parentb0a574fbfcb1e81a23e28e1eff1d4b633d2deb9a (diff)
parenta8e3f77332f655b7d195e1c3e3e0ba931cb8c1cd (diff)
Merge "Do not show user locked notification after reboot when there is no lock" into nyc-mr1-dev
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions