diff options
author | Mike Lockwood <lockwood@android.com> | 2010-06-23 13:20:20 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-23 13:20:20 -0700 |
commit | e496326083450e8623268ed794176d980f99eb0c (patch) | |
tree | 9e50fba1dfd54aa0d80578fb3c930116cceafb7d /tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java | |
parent | 03e90f7eeb032c981fc2952aa33f6ba1fae20d97 (diff) | |
parent | efbe2d78ee5e26b6606c8552a5c1ac70749a5013 (diff) |
am efbe2d78: Merge "andriod.location.Criteria: Simplify new location criteria APIs a bit." into gingerbread
Merge commit 'efbe2d78ee5e26b6606c8552a5c1ac70749a5013' into gingerbread-plus-aosp
* commit 'efbe2d78ee5e26b6606c8552a5c1ac70749a5013':
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