summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2017-02-13 14:19:40 -0800
committerSean McCreary <mccreary@mcwest.org>2017-04-05 19:38:58 -0600
commitdc7805b0c79d056385a076422894425984af2aa0 (patch)
treea3b1d6f33a5ce4a6e35070121320cf1872382ade /include
parent0836dbb870ff45470e595ec921fd5fab6e07d1ce (diff)
downloadframeworks_av-dc7805b0c79d056385a076422894425984af2aa0.zip
frameworks_av-dc7805b0c79d056385a076422894425984af2aa0.tar.gz
frameworks_av-dc7805b0c79d056385a076422894425984af2aa0.tar.bz2
resolve merge conflicts of 79cf158c51 to mnc-dev
AOSP-Change-Id: Ied32e83215e386c801c02991a0b2fa4baa25b643 CVE-2017-0558 (cherry picked from commit 50358a80b1724f6cf1bcdf003e1abf9cc141b122) Change-Id: Ic2e40c7d6aec8427444a1fd145726e490e994d08
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions