summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2015-01-08 01:03:49 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-01-08 01:03:49 +0000
commitbcba21827c836e8941719b432fbf11d1bb8e8639 (patch)
treedde2fcfa5a96fd5b482016e821a721f428288d46 /tools/aapt2/diff/Diff.cpp
parent5df729ad09b85cb68bdf37d58c5d429c2c8663a4 (diff)
parent387da7769757ab6368acb2a0000cd8a85d3e55d8 (diff)
Merge "check ntpserver as empty string instead of null" automerge: dbcb4a1
automerge: 387da77 * commit '387da7769757ab6368acb2a0000cd8a85d3e55d8': check ntpserver as empty string instead of null
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions