summaryrefslogtreecommitdiffstats
path: root/core/java/android/provider/BaseColumns.java
diff options
context:
space:
mode:
authorDave Burke <daveburke@google.com>2013-05-28 22:57:59 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-28 22:57:59 -0700
commit17486b974940e7f129e74d89b7f8fb0473115943 (patch)
tree664797591be51d29005b6bfb0ac895e4d30620ac /core/java/android/provider/BaseColumns.java
parent897d98a7530109bff8d73b3651d8884c76f54c42 (diff)
parented8f94fc454098889ccc6cf7745447090dc16905 (diff)
downloadframeworks_base-17486b974940e7f129e74d89b7f8fb0473115943.zip
frameworks_base-17486b974940e7f129e74d89b7f8fb0473115943.tar.gz
frameworks_base-17486b974940e7f129e74d89b7f8fb0473115943.tar.bz2
am ed8f94fc: Merge "Fix up device sounds." into jb-mr2-dev
* commit 'ed8f94fc454098889ccc6cf7745447090dc16905': Fix up device sounds.
Diffstat (limited to 'core/java/android/provider/BaseColumns.java')
0 files changed, 0 insertions, 0 deletions