| commit | e0831e64e8760efa92e454068d70850672500429 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Nov 11 00:38:47 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 11 00:38:47 2014 +0000 |
| tree | 007290de1c2fbe0b318641c6c98b141640ac621d | |
| parent | 2ee674a9cdd552cfbaf72922d036555996812394 [diff] | |
| parent | 41426ac4dfd24d1a143c133f76f3c87363cc049b [diff] |
am 2e5ee122: (-s ours) am 7c10556c: (-s ours) am 64414f49: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '2e5ee1227bec9c3360c7938e3f81b2d37bf76a1e': Import translations. DO NOT MERGE