summaryrefslogtreecommitdiffstats
path: root/docs/html/training
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2015-04-28 15:16:50 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-28 15:16:50 +0000
commitf8b7897bd17ca42ed16a5fd21033fd18d0579dc5 (patch)
treea8b3e52ddd3e90f61a2ef439d20cfd2447863bec /docs/html/training
parentc64ec04a9aae848835cf7bdbe8e175a623deccf5 (diff)
parente339075aa2f9f614419bcbdefbacd3b507ea0551 (diff)
downloadframeworks_base-f8b7897bd17ca42ed16a5fd21033fd18d0579dc5.zip
frameworks_base-f8b7897bd17ca42ed16a5fd21033fd18d0579dc5.tar.gz
frameworks_base-f8b7897bd17ca42ed16a5fd21033fd18d0579dc5.tar.bz2
am e339075a: (-s ours) am c0aba5f7: (-s ours) am 5e43ae9c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'e339075aa2f9f614419bcbdefbacd3b507ea0551': Import translations. DO NOT MERGE
Diffstat (limited to 'docs/html/training')
0 files changed, 0 insertions, 0 deletions