tree 8f5f5876c97c230d9332677dac431be4d4c4dc9c
parent afe3b88936c7c2496b5e54129caae8efb63e64c4
parent 82440fab169e32ae16f6ea514cbdacffa752aef8
author Chih-Hung Hsieh <chh@google.com> 1507337264 +0000
committer android-build-merger <android-build-merger@google.com> 1507337264 +0000

Merge "Use -Werror in external/aac" am: f38aee2252
am: 82440fab16

Change-Id: I3cee76ab540b54b4ef6d6bdb891fc53fd0ec562d