summaryrefslogtreecommitdiffstats
path: root/docs/html/training
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2014-07-06 19:45:38 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-07-06 19:45:38 +0000
commitabef99cf6a18873ff2079285d26755b41aed979b (patch)
tree52ce1845696e788825e05127a459d7370e0efdfe /docs/html/training
parent11281de7a2c335ed5410fa83b275173130714f52 (diff)
parent02c355d10b3235b73d58ab54222721e32bec3f1f (diff)
downloadframeworks_base-abef99cf6a18873ff2079285d26755b41aed979b.zip
frameworks_base-abef99cf6a18873ff2079285d26755b41aed979b.tar.gz
frameworks_base-abef99cf6a18873ff2079285d26755b41aed979b.tar.bz2
am 02c355d1: (-s ours) am 59db1767: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '02c355d10b3235b73d58ab54222721e32bec3f1f': Import translations. DO NOT MERGE
Diffstat (limited to 'docs/html/training')
0 files changed, 0 insertions, 0 deletions