summaryrefslogtreecommitdiffstats
path: root/services/java/com/android/server/am/ActivityManagerService.java
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2013-05-06 16:37:44 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-05-06 16:37:44 +0000
commit341666c40d222145f7dfd44bdbed48590c4dc5da (patch)
tree440ed1a05cf69d10f8fa5db7615f5248237bb310 /services/java/com/android/server/am/ActivityManagerService.java
parent72f2a7af828056fc426d936c1d40cb6bbdbdf7c7 (diff)
parentaf2eefb70146a94dc4ae1d85ffe2b0e5e8f35a69 (diff)
downloadframeworks_base-341666c40d222145f7dfd44bdbed48590c4dc5da.zip
frameworks_base-341666c40d222145f7dfd44bdbed48590c4dc5da.tar.gz
frameworks_base-341666c40d222145f7dfd44bdbed48590c4dc5da.tar.bz2
Merge "Fix sync problem in NsdManager" into jb-mr2-dev
Diffstat (limited to 'services/java/com/android/server/am/ActivityManagerService.java')
0 files changed, 0 insertions, 0 deletions