| commit | 3a3885c4495928362aad9d452307193840336c89 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Nov 11 00:34:08 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 11 00:34:08 2014 +0000 |
| tree | 53580aabf098457032d3e3826e74bd894bb84d9f | |
| parent | e74f6304ce1ffa15dc357fa6ad2da84e6f7d5b6d [diff] | |
| parent | e0fe662d621b853dde268b99d90004bf67311cf3 [diff] |
am 8044f5f1: (-s ours) am 321e4507: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit '8044f5f19f189eac94a988db5b79a09fe7a71655': Import translations. DO NOT MERGE