summaryrefslogtreecommitdiffstats
path: root/media/jni/android_media_AmrInputStream.cpp
diff options
context:
space:
mode:
authordestradaa <destradaa@google.com>2015-04-29 18:34:18 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-29 18:34:18 +0000
commitcbba357159fdd2db94052addb14d989df39ccd97 (patch)
tree6422eb909935e6637059a9e8a28b924e0942d48e /media/jni/android_media_AmrInputStream.cpp
parent402bcf77d2870837d271b6b1cceb0942be152a6d (diff)
parent2c160c1a64a696dcb6261311ca0a406a07231d33 (diff)
downloadframeworks_base-cbba357159fdd2db94052addb14d989df39ccd97.zip
frameworks_base-cbba357159fdd2db94052addb14d989df39ccd97.tar.gz
frameworks_base-cbba357159fdd2db94052addb14d989df39ccd97.tar.bz2
am 2c160c1a: am bdf9ffdd: am c0667853: Merge "Add SystemApis in GpsMeasurements APIs to reflect changes in GPS HAL. b/19938206" into mnc-dev
* commit '2c160c1a64a696dcb6261311ca0a406a07231d33': Add SystemApis in GpsMeasurements APIs to reflect changes in GPS HAL. b/19938206
Diffstat (limited to 'media/jni/android_media_AmrInputStream.cpp')
0 files changed, 0 insertions, 0 deletions