summaryrefslogtreecommitdiffstats
path: root/core/res
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@google.com>2014-01-08 08:01:42 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2014-01-08 08:01:42 -0800
commit12ec2e6d71bc69ca11946f7f051931863c934273 (patch)
treed887169f1fd89204ca6cd553df63e9be686e6199 /core/res
parent136c02191790aa937c490341df49e966735f6857 (diff)
parent992065938a95e5273b22dea009b8581bcc693e61 (diff)
downloadframeworks_base-12ec2e6d71bc69ca11946f7f051931863c934273.zip
frameworks_base-12ec2e6d71bc69ca11946f7f051931863c934273.tar.gz
frameworks_base-12ec2e6d71bc69ca11946f7f051931863c934273.tar.bz2
am 99206593: am 9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters"
* commit '992065938a95e5273b22dea009b8581bcc693e61': Added missing USB device descriptor fields needed for intent filters
Diffstat (limited to 'core/res')
0 files changed, 0 insertions, 0 deletions