| commit | 4436e6b53836eaaf258e3730786d74595d561fc5 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Nov 13 04:12:03 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 13 04:12:03 2014 +0000 |
| tree | bce15f72522dfd9d58be372ff373bc0cf0bdcde4 | |
| parent | d1314074b355765d1a6cf806aaeafb77ca788c25 [diff] | |
| parent | 3da8c2dcb34990da129fb170e5f0e69b8a9eaa60 [diff] |
am 3da8c2dc: (-s ours) am 4a6108ab: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit '3da8c2dcb34990da129fb170e5f0e69b8a9eaa60': Import translations. DO NOT MERGE