| commit | cf197903435222b18fe18c78d4e1e976d96d9ab9 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Aug 26 02:54:15 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 26 02:54:15 2015 +0000 |
| tree | 0af74e9f585ff7ffe64c19634019105808e4aa50 | |
| parent | 4d44fcd061329d121965bee229d3fca5d282e5c1 [diff] | |
| parent | 660265b3fc41489c0cb67d5474651dcfcc1b3938 [diff] |
am 660265b3: (-s ours) am 9fd976e4: (-s ours) Import translations. DO NOT MERGE * commit '660265b3fc41489c0cb67d5474651dcfcc1b3938':