summaryrefslogtreecommitdiffstats
path: root/core/java/android/content/ContentProviderNative.java
diff options
context:
space:
mode:
authorSascha Prueter <saschap@google.com>2013-01-10 11:16:51 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-01-10 11:16:51 -0800
commit28608bbb2fb6daf3d261cb10eaeb1849781cf77d (patch)
treef82f206abe911953e78c517f659e13f4ff7e79fe /core/java/android/content/ContentProviderNative.java
parentd6ddb51b3d4ec1bb2e6305823681cdeb05c0ea7b (diff)
parentd692ea6dd297fbd39885525a29bdf6637a3640f2 (diff)
downloadframeworks_base-28608bbb2fb6daf3d261cb10eaeb1849781cf77d.zip
frameworks_base-28608bbb2fb6daf3d261cb10eaeb1849781cf77d.tar.gz
frameworks_base-28608bbb2fb6daf3d261cb10eaeb1849781cf77d.tar.bz2
am d692ea6d: am b5e4835e: Merge "Improve heuristics for detecting wireless chargers." into jb-mr1.1-dev
* commit 'd692ea6dd297fbd39885525a29bdf6637a3640f2': Improve heuristics for detecting wireless chargers.
Diffstat (limited to 'core/java/android/content/ContentProviderNative.java')
0 files changed, 0 insertions, 0 deletions