aboutsummaryrefslogtreecommitdiffstats
path: root/NOTICE
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2016-04-20 23:40:28 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-04-20 23:40:28 +0000
commit18a9bb8b6d6bebae0cf3bdb404a2f8c417cd17fc (patch)
tree54f00c5c12777852b7dc3a7999e49e3c4bf5fc78 /NOTICE
parent268c63c4a5c0152e35a76d1f18a9a80978e7b7c4 (diff)
parent28099687b733eac90cff9273b6f8f660176e0784 (diff)
downloadfdk-aac-18a9bb8b6d6bebae0cf3bdb404a2f8c417cd17fc.tar.gz
fdk-aac-18a9bb8b6d6bebae0cf3bdb404a2f8c417cd17fc.tar.bz2
fdk-aac-18a9bb8b6d6bebae0cf3bdb404a2f8c417cd17fc.zip
resolve merge conflicts of ad1e898 to nyc-dev-plus-aosp
am: 2809968 * commit '28099687b733eac90cff9273b6f8f660176e0784': Remove redundant parentheses around == comparison operator Change-Id: I87566357ee932ac57eed79645fec146625c85cdb
Diffstat (limited to 'NOTICE')
0 files changed, 0 insertions, 0 deletions