summaryrefslogtreecommitdiffstats
path: root/docs/html/training
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2014-04-04 14:30:55 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-04 14:30:55 +0000
commit87210ee9621829786516f52fc45dfeabd5daec0a (patch)
tree122703526314e3ed4c2ba6f740ad0433dbd676bf /docs/html/training
parentab0c43a4581d5b34ea9590cad4495447aa536942 (diff)
parentb285604185de1ade346eadb78971712607f54058 (diff)
downloadframeworks_base-87210ee9621829786516f52fc45dfeabd5daec0a.zip
frameworks_base-87210ee9621829786516f52fc45dfeabd5daec0a.tar.gz
frameworks_base-87210ee9621829786516f52fc45dfeabd5daec0a.tar.bz2
am b2856041: (-s ours) am 81e62eb1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'b285604185de1ade346eadb78971712607f54058': Import translations. DO NOT MERGE
Diffstat (limited to 'docs/html/training')
0 files changed, 0 insertions, 0 deletions