commit | 914e8314d0ba229f28eaadf2094459ac2ed70eca | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Tue Sep 29 14:42:52 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 29 14:42:52 2015 +0000 |
tree | e2672ca547a68f4d9dff978e68de3e2fafbbc64e | |
parent | e1bed0c3b33920834ba19e2954171890b12510ce [diff] | |
parent | ae7a8ce8e0721805f834ed03bda1d50457375f4a [diff] |
am 0d8e091e: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master * commit '0d8e091ee615fd8580d52e238070e26c3b41c594': Import translations. DO NOT MERGE