summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorJulia Reynolds <juliacr@google.com>2015-07-27 20:20:41 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-27 20:20:41 +0000
commit13ad04e76be2fb34ffc9a039272a82636e215caa (patch)
treed1187494ff24666706dce358189bd22c1dfdcae0 /tools/aapt2/diff/Diff.cpp
parent7739273bb7eeac531601edfc9091d42bff605a76 (diff)
parent3df17a6d01507de4690601f948ec776f48ccba87 (diff)
am 3df17a6d: am f68e0236: Merge "Allow Settings to set background data restrict on secondary users." into mnc-dev
* commit '3df17a6d01507de4690601f948ec776f48ccba87': Allow Settings to set background data restrict on secondary users.
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions