diff options
| author | Dianne Hackborn <hackbod@google.com> | 2009-07-28 15:23:21 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2009-07-28 15:23:21 -0700 |
| commit | 02f5228c3c224dc8804cbedd40899fa0c42bfd4a (patch) | |
| tree | 21267ea74f5159b7aa52751c6e8a3de368c08c39 /test-runner | |
| parent | b2fe1fd4ae31df7a0366c59c4a1393fb281c4fde (diff) | |
| parent | f0d83fd907e0d2a0b2fe563cea9ffa830ecfd33f (diff) | |
| download | frameworks_base-02f5228c3c224dc8804cbedd40899fa0c42bfd4a.zip frameworks_base-02f5228c3c224dc8804cbedd40899fa0c42bfd4a.tar.gz frameworks_base-02f5228c3c224dc8804cbedd40899fa0c42bfd4a.tar.bz2 | |
resolved conflicts for merge of f0d83fd9 to master
Diffstat (limited to 'test-runner')
| -rw-r--r-- | test-runner/android/test/mock/MockContext.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/test-runner/android/test/mock/MockContext.java b/test-runner/android/test/mock/MockContext.java index b83a44d..9fb1e61 100644 --- a/test-runner/android/test/mock/MockContext.java +++ b/test-runner/android/test/mock/MockContext.java @@ -110,6 +110,7 @@ public class MockContext extends Context { throw new UnsupportedOperationException(); } + /** @hide */ @Override public File getSharedPrefsFile(String name) { throw new UnsupportedOperationException(); |