commit | ee6844fa2dfc890e4156a1042476701b004ffa7b | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Jun 01 14:46:20 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 01 14:46:20 2015 +0000 |
tree | 5d01fe8f3898c81c15d743f156fadef6f348c1b0 | |
parent | ace549af2feef2a06f32c1d10515582f2840959c [diff] | |
parent | ba09684a8e70c7527125df70f3006e81c8d112db [diff] |
am ba09684a: (-s ours) am aa303f67: (-s ours) Revert "Import translations. DO NOT MERGE" * commit 'ba09684a8e70c7527125df70f3006e81c8d112db': Revert "Import translations. DO NOT MERGE"