summaryrefslogtreecommitdiffstats
path: root/core/java/android/provider/Settings.java
diff options
context:
space:
mode:
authorTeng-Hui Zhu <ztenghui@google.com>2012-05-11 10:00:06 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-05-11 10:00:06 -0700
commit9ac320406bcd0212923bfc0b4068df0b022fd4f7 (patch)
tree7a4eeba38c1dcef4b321e34240e83acda0e6ed30 /core/java/android/provider/Settings.java
parent6df5ca08f192e2b831c6cf216f3a2cfe63456ad0 (diff)
parent4dd9dc8204105a25e37dacbc392ea3c7212a8063 (diff)
downloadframeworks_base-9ac320406bcd0212923bfc0b4068df0b022fd4f7.zip
frameworks_base-9ac320406bcd0212923bfc0b4068df0b022fd4f7.tar.gz
frameworks_base-9ac320406bcd0212923bfc0b4068df0b022fd4f7.tar.bz2
Merge "Keep the controller when video ended." into jb-dev
Diffstat (limited to 'core/java/android/provider/Settings.java')
0 files changed, 0 insertions, 0 deletions