summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorTyler Gunn <tgunn@google.com>2016-08-26 20:28:33 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-08-26 20:28:36 +0000
commit020212c7df814d60cf3c395f39bea1a18a369ec9 (patch)
treeb39fd88f59fc72392f6b812a7e4461bf1054c74b /tools/aapt2/diff/Diff.cpp
parent80855e154e04977f2f9db8d080fee6e4b4abd83c (diff)
parentd81c426e1d8c03d3a72197af9761fcec72fd3013 (diff)
Merge "Add device config to determine when "allow hold" carrier config is used." into nyc-mr1-dev
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions