summaryrefslogtreecommitdiffstats
path: root/media/java
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@google.com>2012-10-18 13:44:27 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-18 13:44:28 -0700
commitb98c2fb0998b2ad6bffe9c06dd358ba4705eaa4b (patch)
treeb8defb05b6e4ccbc1935a1ecd843bae607c66f0a /media/java
parent58e60c239f1d08a67a154d974cab9711a1dd7ecc (diff)
parent62fa6de135269a7da135bb89b1eb047a4f11d343 (diff)
downloadframeworks_base-b98c2fb0998b2ad6bffe9c06dd358ba4705eaa4b.zip
frameworks_base-b98c2fb0998b2ad6bffe9c06dd358ba4705eaa4b.tar.gz
frameworks_base-b98c2fb0998b2ad6bffe9c06dd358ba4705eaa4b.tar.bz2
Merge "Do a clean shutdown of p2p" into jb-mr1-dev
Diffstat (limited to 'media/java')
0 files changed, 0 insertions, 0 deletions