commit | 2f3c72b977efe0fab18cff7c8ab35e7847953841 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Thu Aug 27 09:41:11 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 09:41:11 2015 +0000 |
tree | 715d547d2502de8d04de0ec12233b3183ce62c99 | |
parent | e7baf7f830714aa3fa8d4ed5bb93247a195304a9 [diff] | |
parent | c8dcee0fa8cede4fec399235f40eb76b41f01a6c [diff] |
am c8dcee0f: (-s ours) am bbb47d88: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit 'c8dcee0fa8cede4fec399235f40eb76b41f01a6c':