commit | 85a33cf9e8c805ff02b973cf05f17c5dfb6da4e0 | [log] [tgz] |
---|---|---|
author | Jeff Tinker <jtinker@google.com> | Thu Apr 06 00:20:18 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Apr 06 00:20:18 2017 +0000 |
tree | 15a0902977e264f54160e36437005403ce1b8cb0 | |
parent | 267b0a88da7dca07735153d7e8759a9a29669d70 [diff] | |
parent | f951a68e20afbc60adc62347c046b036ed9c23de [diff] |
Merge "Correct NDK docs for MediaDrm#getKeyRequest" into oc-dev am: 08e96196ee am: f951a68e20 Change-Id: I6c89ecd007acb99e78df082a37391c368dba4881