summaryrefslogtreecommitdiffstats
path: root/core/java/android/preference
diff options
context:
space:
mode:
authorScott Rowe <scottrowe@google.com>2014-11-01 16:54:34 +0000
committerandroid-build-merger <android-build-merger@google.com>2014-11-01 16:54:34 +0000
commit201805a49f57edd576eb59eeb4eee3088841a101 (patch)
treea076c200ff80dbb2fb6e60212a278e5c913cee13 /core/java/android/preference
parente05fb136cd3e9748410ba31e370cce0f81c090b6 (diff)
parent4e439d0312b753b1162519baa473e5358c842069 (diff)
downloadframeworks_base-201805a49f57edd576eb59eeb4eee3088841a101.zip
frameworks_base-201805a49f57edd576eb59eeb4eee3088841a101.tar.gz
frameworks_base-201805a49f57edd576eb59eeb4eee3088841a101.tar.bz2
am 8d262c3a: am 20ee9f12: am de740985: am aa275bf9: Merge "docs: b/15180738 - invalid urls in badge generator" into lmp-docs
automerge: 4e439d0 * commit '4e439d0312b753b1162519baa473e5358c842069': docs: b/15180738 - invalid urls in badge generator
Diffstat (limited to 'core/java/android/preference')
0 files changed, 0 insertions, 0 deletions