diff options
author | Geoff Mendal <mendal@google.com> | 2014-12-04 20:31:29 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-04 20:31:29 +0000 |
commit | 597a75318e22ebebf9338f5dfc7d7c99aa3f23a2 (patch) | |
tree | 73600ba3bf4c8a4003fcb4c62188534d79bb2c7b /docs | |
parent | 17904f8b9c7553601d4ec1b24356c43cb80c318f (diff) | |
parent | 9ece2e960046a169ac30c4b23119052793c76d98 (diff) | |
download | frameworks_base-597a75318e22ebebf9338f5dfc7d7c99aa3f23a2.zip frameworks_base-597a75318e22ebebf9338f5dfc7d7c99aa3f23a2.tar.gz frameworks_base-597a75318e22ebebf9338f5dfc7d7c99aa3f23a2.tar.bz2 |
am 9ece2e96: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '9ece2e960046a169ac30c4b23119052793c76d98':
Import translations. DO NOT MERGE
Diffstat (limited to 'docs')
0 files changed, 0 insertions, 0 deletions