| commit | 345068b1212592cebee5c1295e148b555575227b | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Aug 04 07:53:50 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Aug 04 07:53:50 2018 -0700 |
| tree | a70235945948deff0968ff1af50a810795685572 | |
| parent | 91aec57d67ea6030b5a8cc30acccc89e5b1d37d3 [diff] | |
| parent | 347a9297cbebbcc8aca7fbc09a4fa4a527fde87a [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 673c0661db -s ours am: 347a9297cb -s ours Change-Id: I7d6f71140bbfbe165017c32957977c62d2f3e41b