| commit | e2d0ffd8a9a455df2bb6ba421d4c2ecbdce3ec42 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Jan 29 01:22:55 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 29 01:22:55 2015 +0000 |
| tree | 4166f35e207a2990be6928d39dcc40a24f208838 | |
| parent | 720b0f25b30ee463d7ce99f616daac484eb759aa [diff] | |
| parent | 72e69bd96c8aa2bd689657a4fcd9a80736b980fc [diff] |
am 72e69bd9: (-s ours) am cad0777a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '72e69bd96c8aa2bd689657a4fcd9a80736b980fc': Import translations. DO NOT MERGE