| commit | 2211e92f727b13bd08ded7008ebdaa1f264f8186 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 29 14:30:05 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 29 14:30:05 2015 +0000 |
| tree | 0bc7e9197d0558eef4018e9e6e7203cab67c9c60 | |
| parent | a4599ae05784fda70fcdedab9c4befbecde02641 [diff] | |
| parent | 176f4e38740abed0f7f301d836d492ca0ef8058f [diff] |
am 176f4e38: (-s ours) am 3b292202: (-s ours) am 6ace2bc9: (-s ours) Import translations. DO NOT MERGE * commit '176f4e38740abed0f7f301d836d492ca0ef8058f': Import translations. DO NOT MERGE