commit | 80ca8ac09b75b6d7d72d39203382fa15bd8f7fc4 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Sep 17 20:48:56 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Sat Sep 17 20:48:56 2016 +0000 |
tree | 8f7affd2d556eb37ddc412bce25efed680542a3e | |
parent | effc28c51259376422e17aa9f8e53fb056689188 [diff] | |
parent | a7be68f24e5960b3a95b34298e60ebf7a536ef1f [diff] |
Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev am: 6ade653254 -s ours am: a7be68f24e -s ours Change-Id: I597b365571cd31f60d68024e66dbf75bad619d15