OSDN Git Service

Merge "MediaFormat: fix javadoc for AAC-related keys" into pi-dev
authorJean-Michel Trivi <jmtrivi@google.com>
Fri, 18 May 2018 20:49:34 +0000 (13:49 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 18 May 2018 20:49:34 +0000 (13:49 -0700)
commit6a59e737fced7bab1170f99d196344f559472f89
treee50057cb473c3235cef26deae2b19521ada4c022
parent8d28303afce775cd0ef47f78801dfef099b5a0c5
parent1b3ef3cb7d54732064a1b2d66289e1149e099404
Merge "MediaFormat: fix javadoc for AAC-related keys" into pi-dev
am: 1b3ef3cb7d

Change-Id: I75f8fffea0bcc873e0b7aed257c30d8a03f97f29