commit | 55d7bf4f5cb26c4f26c3ac6cbad0b8ca3c0ad579 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Oct 07 15:55:23 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 07 15:55:23 2015 +0000 |
tree | d3995dd00245a4e3ac13e31c3199e5d0a7a86b59 | |
parent | b224ec187db4f065bc8f4015eadfef10deba0e73 [diff] | |
parent | 32f4b4690ee39986595ad0803070f112e06203ef [diff] |
am 32f4b469: (-s ours) am 47e870ad: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev * commit '32f4b4690ee39986595ad0803070f112e06203ef': Import translations. DO NOT MERGE