summaryrefslogtreecommitdiffstats
path: root/core/java/android/net
diff options
context:
space:
mode:
authorCedric Ho <cedricho@google.com>2015-04-29 17:32:32 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-29 17:32:32 +0000
commitfbad902aad433f4eaa82192019fef1dcaba26d47 (patch)
tree18f7c6fa52a5ed6a4993fb4d7a29ab1516aa86e6 /core/java/android/net
parentfb5caad6d71c1ed0c2ea7065f5bc650822d70e16 (diff)
parent80fa2cc8a96e05cec574bd06c9038ad4255ecafb (diff)
downloadframeworks_base-fbad902aad433f4eaa82192019fef1dcaba26d47.zip
frameworks_base-fbad902aad433f4eaa82192019fef1dcaba26d47.tar.gz
frameworks_base-fbad902aad433f4eaa82192019fef1dcaba26d47.tar.bz2
am 80fa2cc8: Merge "Add android.speech.RecognizerIntent EXTRA_PREFER_OFFLINE to indicate whether to only use an offline speech recognition engine." into mnc-dev
* commit '80fa2cc8a96e05cec574bd06c9038ad4255ecafb': Add android.speech.RecognizerIntent EXTRA_PREFER_OFFLINE to indicate whether to only use an offline speech recognition engine.
Diffstat (limited to 'core/java/android/net')
0 files changed, 0 insertions, 0 deletions