summaryrefslogtreecommitdiffstats
path: root/tests/MemoryUsage/AndroidManifest.xml
diff options
context:
space:
mode:
authorSelim Cinek <cinek@google.com>2015-05-05 23:52:34 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-05 23:52:35 +0000
commit6329bbceebc8c0d6de164cb693a828402542fd35 (patch)
tree36671db8a9145fdf11f3d928622c26aa766581b4 /tests/MemoryUsage/AndroidManifest.xml
parent9c7ce8b0fc8e429e2524b346174cb67b59c7e175 (diff)
parente70d6535237d2e6f03adcd0bdc11e45ea714dc97 (diff)
downloadframeworks_base-6329bbceebc8c0d6de164cb693a828402542fd35.zip
frameworks_base-6329bbceebc8c0d6de164cb693a828402542fd35.tar.gz
frameworks_base-6329bbceebc8c0d6de164cb693a828402542fd35.tar.bz2
Merge "The voice assist may now be launched above the lockscreen" into mnc-dev
Diffstat (limited to 'tests/MemoryUsage/AndroidManifest.xml')
0 files changed, 0 insertions, 0 deletions