commit | 544714d0ea30ecc260778324e31b06d60f323ee2 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Feb 04 18:58:05 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 04 18:58:05 2015 +0000 |
tree | b7f3bbd2024c554aa9405d09c89d4b4483adc38f | |
parent | f15248bdb5299fefb65eb6cf816d6db590e70cf4 [diff] | |
parent | 2a9fef1ae71c2580741a8ac960a385e915622c17 [diff] |
am 2a9fef1a: (-s ours) Import translations. DO NOT MERGE automerge: 40e66bc -s ours * commit '2a9fef1ae71c2580741a8ac960a385e915622c17': Import translations. DO NOT MERGE