summaryrefslogtreecommitdiff
path: root/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2010-06-23 13:23:28 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-06-23 13:23:28 -0700
commitc0b14c73fe12fa9f0a9459ff025b11cc9067084f (patch)
tree4c023fce92c101ca82b7abe6b888a441ed4fb37e /tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java
parent230f5c1cfb898430c12eee40b8321385bc495e9c (diff)
parente496326083450e8623268ed794176d980f99eb0c (diff)
am e4963260: am efbe2d78: Merge "andriod.location.Criteria: Simplify new location criteria APIs a bit." into gingerbread
Merge commit 'e496326083450e8623268ed794176d980f99eb0c' * commit 'e496326083450e8623268ed794176d980f99eb0c': andriod.location.Criteria: Simplify new location criteria APIs a bit.
Diffstat (limited to 'tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java')
0 files changed, 0 insertions, 0 deletions