summaryrefslogtreecommitdiffstats
path: root/services/voiceinteraction
diff options
context:
space:
mode:
authorSvet Ganov <svetoslavganov@google.com>2015-04-23 15:30:43 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-23 15:30:43 +0000
commitd24cc19343073294b3376f825bdc0d54a8d692f1 (patch)
treefa59453d9fe7d70de4bbfa7e7c0eef0360da88c9 /services/voiceinteraction
parentd80f4fc80a132b40ace7ba2b51eb784d73443004 (diff)
parentdb672b6cde256e27c1188c7e99f23e5a65252ba4 (diff)
downloadframeworks_base-d24cc19343073294b3376f825bdc0d54a8d692f1.zip
frameworks_base-d24cc19343073294b3376f825bdc0d54a8d692f1.tar.gz
frameworks_base-d24cc19343073294b3376f825bdc0d54a8d692f1.tar.bz2
am db672b6c: am 00e91901: Merge "DO NOT MERGE Don\'t take flags when creating app widget config activity." into lmp-mr1-dev
* commit 'db672b6cde256e27c1188c7e99f23e5a65252ba4': DO NOT MERGE Don't take flags when creating app widget config activity.
Diffstat (limited to 'services/voiceinteraction')
0 files changed, 0 insertions, 0 deletions