summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorTyler Gunn <tgunn@google.com>2015-07-28 21:36:58 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-28 21:36:58 +0000
commit832901356015eb08836c1688ec3ba96efb4e4a11 (patch)
treeef5c57ff64e67e39fdb2f74a94379915c3daef2c /tools/aapt2/diff/Diff.cpp
parent0091e2c03d1f2d212c94a3096e86407c78df6820 (diff)
parent8d74abb5bb5cf479f97b26ca8328766dbd6a4257 (diff)
am 8d74abb5: am 444185e8: am 3d83e744: am bdbec480: Merge "Add "Call subject" capability to phone accounts." into mnc-dev
* commit '8d74abb5bb5cf479f97b26ca8328766dbd6a4257': Add "Call subject" capability to phone accounts.
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions