OSDN Git Service

Merge "Add AssetFileDescriptor to MediaExtractor." into nyc-dev
authorJeff Sharkey <jsharkey@google.com>
Sat, 5 Mar 2016 23:09:23 +0000 (23:09 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 5 Mar 2016 23:09:25 +0000 (23:09 +0000)
1  2 
api/current.txt
api/system-current.txt
api/test-current.txt

diff --cc api/current.txt
Simple merge
Simple merge
Simple merge