| commit | 17a527f267c01895ea7397e122215b7c4a669d0b | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Mon Jun 27 16:21:26 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Jun 27 16:21:27 2016 +0000 |
| tree | 47285af79b4cc2e0deea3c2891859b3c79b7ae6a | |
| parent | 19a08cc5cb0a968bab7fb92f00c32b05befa41f4 [diff] | |
| parent | 09a2a400c519ef81af93ba9b78f0844b7c0e49af [diff] |
Merge "Merge \\"media: document format keys for MediaMuxer\\" into nyc-dev am: 5059e65fec am: 8ae7c6b61e" into nyc-mr1-dev-plus-aosp