diff options
author | Mathias Agopian <mathias@google.com> | 2010-08-11 18:07:42 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-11 18:07:42 -0700 |
commit | aa17f004059fc3b85a6a30e1ae48cbfb4990e005 (patch) | |
tree | 735c9e6a8acddf64b8886b52fc557a0689bcd283 /core/java/android/content/ContentProviderClient.java | |
parent | b8244f47053963a89ee1964fd73c859e9863a7c5 (diff) | |
parent | 70a7c92e161225f587af453e01d2b124dbf6303f (diff) | |
download | frameworks_base-aa17f004059fc3b85a6a30e1ae48cbfb4990e005.zip frameworks_base-aa17f004059fc3b85a6a30e1ae48cbfb4990e005.tar.gz frameworks_base-aa17f004059fc3b85a6a30e1ae48cbfb4990e005.tar.bz2 |
am 70a7c92e: am 65f2490e: Merge "should fix sim build, hopefully" into gingerbread
Merge commit '70a7c92e161225f587af453e01d2b124dbf6303f'
* commit '70a7c92e161225f587af453e01d2b124dbf6303f':
should fix sim build, hopefully
Diffstat (limited to 'core/java/android/content/ContentProviderClient.java')
0 files changed, 0 insertions, 0 deletions