commit | d547b892774221eaafbd9a49bbb25d8aa7ac117d | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Jul 01 05:34:02 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jul 01 05:34:02 2016 +0000 |
tree | 6316c6e0c6ddc338068e3e82819de02d28bb4f4b | |
parent | 255c8cf401eb07e14397950133fe645bf7e82dab [diff] | |
parent | 715aa961ba159365c76f3eb01dfdbd85377acbb0 [diff] |
Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am: 7061535ce6 -s ours am: 715da3530a -s ours am: 715aa961ba -s ours Change-Id: Id4d9a383f1fdb4f0721cfeca4a98d0b42a4173d4