summaryrefslogtreecommitdiffstats
path: root/core/java/android/server
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-06-02 09:03:04 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-06-02 09:03:04 -0700
commitb705eea70245dae69d16e18d63b3ee38e1d0c5c3 (patch)
treeac300b9ef5e3d98c5d98e47dca199fe001ea1921 /core/java/android/server
parent59c82376e573d35f1bad7a35ccd3fe6df85f4342 (diff)
parent1bd7597b8cdaf39d1183077c463cb30596eb31b0 (diff)
downloadframeworks_base-b705eea70245dae69d16e18d63b3ee38e1d0c5c3.zip
frameworks_base-b705eea70245dae69d16e18d63b3ee38e1d0c5c3.tar.gz
frameworks_base-b705eea70245dae69d16e18d63b3ee38e1d0c5c3.tar.bz2
am 1bd7597b: merge from open-source master
Merge commit '1bd7597b8cdaf39d1183077c463cb30596eb31b0' into kraken * commit '1bd7597b8cdaf39d1183077c463cb30596eb31b0': Replaced raw string arguments for Context.getSystemService() with final Context variables
Diffstat (limited to 'core/java/android/server')
0 files changed, 0 insertions, 0 deletions