| commit | e9cc771dee56c57566a3efaaa39aa3a4a708fec2 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 27 11:28:38 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:28:38 2015 +0000 |
| tree | edb91ce7e7c9dc6d33389277e2e2adcac1d36854 | |
| parent | a74496734bf2a2761c198d75c986dd3fd4d8920b [diff] | |
| parent | 96d0e0194d43d3cdf04f39d5791160a91e0734bd [diff] |
am 96d0e019: (-s ours) am 7d5fb3a9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '96d0e0194d43d3cdf04f39d5791160a91e0734bd':