tree 6686a9a41a033fbe1be6320e54b0f4fc82477ad5
parent af3c550fa2e647a8a5787d0e9f02c46251e321b5
parent 984db62e3a38dc170c4e9c1f94aabee88d294a97
author TreeHugger Robot <treehugger-gerrit@google.com> 1467348678 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1467348678 +0000

Merge "Import translations. DO NOT MERGE" into stage-aosp-master