summaryrefslogtreecommitdiffstats
path: root/media/ndk/NdkMediaMuxer.cpp
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2014-05-29 15:35:07 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-29 15:35:08 +0000
commit798ce934571bc7eb5715bf1c03cbe5436a1220e3 (patch)
treeaafe457a33a5b221a28a3f00668ac1ed753e12d1 /media/ndk/NdkMediaMuxer.cpp
parent7f692022a6e91723eb84a41f14b64fa565274424 (diff)
parenteb4860c305def68c5965474bb43c67c2c9d49bbb (diff)
downloadframeworks_av-798ce934571bc7eb5715bf1c03cbe5436a1220e3.zip
frameworks_av-798ce934571bc7eb5715bf1c03cbe5436a1220e3.tar.gz
frameworks_av-798ce934571bc7eb5715bf1c03cbe5436a1220e3.tar.bz2
Merge "getSampletime -> getSampleTime"
Diffstat (limited to 'media/ndk/NdkMediaMuxer.cpp')
0 files changed, 0 insertions, 0 deletions