| commit | 0dcc354eda89e6c3848c95783cdc060be7f10c2f | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Mar 26 21:19:12 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 26 21:19:12 2015 +0000 |
| tree | dde12831e3589ec9f2f2bd657262786dc7c94ae4 | |
| parent | a8aab1d61d8e06b75103b6cb34fb5646896b9c01 [diff] | |
| parent | ec71a21787c94c0698f98316a6189d3a472bdb88 [diff] |
am ec71a217: (-s ours) am 75a05460: (-s ours) am ef9b3c13: (-s ours) am e397cbe2: (-s ours) am ca58fb9c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'ec71a21787c94c0698f98316a6189d3a472bdb88':