summaryrefslogtreecommitdiffstats
path: root/docs/html-intl/intl/zh-cn
diff options
context:
space:
mode:
authorRicardo Cervera <rcervera@google.com>2014-02-12 22:22:06 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-02-12 22:22:06 +0000
commitd34172830cf4ce3524be500d77dc26e80f0f8190 (patch)
tree6fc3ddbb7c55e11d10db69871990eb8715b83164 /docs/html-intl/intl/zh-cn
parent131c2e13bac619144f2780baf229c34b33b0c674 (diff)
parent481993e92c20907521e22a57d09c8b7c206af726 (diff)
downloadframeworks_base-d34172830cf4ce3524be500d77dc26e80f0f8190.zip
frameworks_base-d34172830cf4ce3524be500d77dc26e80f0f8190.tar.gz
frameworks_base-d34172830cf4ce3524be500d77dc26e80f0f8190.tar.bz2
am 481993e9: am 3cb62db2: am 640e0c89: am 36547014: am 670944aa: Merge "docs: Added missing elements in uses-feature. Bug: 12913153" into klp-docs
* commit '481993e92c20907521e22a57d09c8b7c206af726': docs: Added missing elements in uses-feature. Bug: 12913153
Diffstat (limited to 'docs/html-intl/intl/zh-cn')
0 files changed, 0 insertions, 0 deletions