commit | 0bbacbdd2f3d7711fb9bbcb2852ff62fd497d731 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Feb 16 17:12:23 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 16 17:12:23 2015 +0000 |
tree | 9749d530564752815ace9e6610c94e5f2d3783a4 | |
parent | 9bf1c310132b914dcd7bb760ac68a0833374e6cb [diff] | |
parent | 0a786f5f227683f2d54145117b746629ddd2c32b [diff] |
am 0a786f5f: (-s ours) am f27b9850: (-s ours) Import translations. DO NOT MERGE * commit '0a786f5f227683f2d54145117b746629ddd2c32b':