tree bc6e64c7dc08fcbda6e1d65c7423d003426f6d6c
parent d5fe9f60b3af05f91ca0548c4fb91745dd2a85b1
parent 9bf06d83ce4dac2316d25427e074637e3427a1ed
author Geoff Mendal <mendal@google.com> 1425483221 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1425483222 +0000

Merge "Import translations. DO NOT MERGE"