summaryrefslogtreecommitdiff
path: root/tools/aapt2/ResourceParser.cpp
diff options
context:
space:
mode:
author Jean-Michel Trivi <jmtrivi@google.com> 2017-05-02 17:56:07 +0000
committer android-build-merger <android-build-merger@google.com> 2017-05-02 17:56:07 +0000
commit7f2cc46a0fd89575324742d100ecfd178fd8ef74 (patch)
tree608390edb88c743921b562adf4843237a567aaae /tools/aapt2/ResourceParser.cpp
parentc812cf27ab3d081cae5fd81bc2f4cfbd8014b01e (diff)
parentdce4dfc6fce225f0bf9c14be8cfe6b93453864d1 (diff)
Merge "Audio focus: fix notifying apps to pause without an external policy" into oc-dev
am: dce4dfc6fc Change-Id: Ic42056d370ecd0a08574dd575856ff15813bc8c0
Diffstat (limited to 'tools/aapt2/ResourceParser.cpp')
0 files changed, 0 insertions, 0 deletions