summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorHongming Jin <hongmingjin@google.com>2016-09-14 23:23:10 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-09-14 23:23:10 +0000
commit482d817b5a1e8f1cdda213e35291720a6289ebd2 (patch)
treef769d9215f140052b0f95a98c2cb38e3829379fd /tools/aapt2/diff/Diff.cpp
parent57e38003e817b06f981644f98569ecc77288a776 (diff)
parent0c04977949abdcf90a93d3dac3f1ce70613e7f33 (diff)
Merge "Only return password for account session flow if the caller is signed with system key and have get_password permission." into nyc-dev
am: 0c04977949 Change-Id: I97506d9c1304b844d9ec6c375aa3594a25c255fc
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions