summaryrefslogtreecommitdiffstats
path: root/opengl
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2014-11-17 19:32:03 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-17 19:32:03 +0000
commit519cc65dd84f04c9078d70fb06c01fb63357ae93 (patch)
tree0d4d7172e24efa8d361c11ae9cea8df410e5ac38 /opengl
parente12cfc23b2399ded0cc4608e47c5ba864fc5ab7d (diff)
parent7d9fdd1e0d980fb9e67fbb96b4c499b1895109f1 (diff)
downloadframeworks_native-519cc65dd84f04c9078d70fb06c01fb63357ae93.zip
frameworks_native-519cc65dd84f04c9078d70fb06c01fb63357ae93.tar.gz
frameworks_native-519cc65dd84f04c9078d70fb06c01fb63357ae93.tar.bz2
am 7d9fdd1e: Merge "Issue #17551667: Voice interaction service should be disabled..." into lmp-mr1-dev
* commit '7d9fdd1e0d980fb9e67fbb96b4c499b1895109f1': Issue #17551667: Voice interaction service should be disabled...
Diffstat (limited to 'opengl')
0 files changed, 0 insertions, 0 deletions