tree 98b3595e7693d27b9bcd0c98d10ebded58ede791
parent d0625cedca001cad32767cb834e71508d6013e68
parent 57d73dbd345200edfa57b7f206f4449cb9802e43
author Geoff Mendal <mendal@google.com> 1424995973 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1424995974 +0000

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