commit | 5c8b2fabfe13c2397b82441863f8069087629299 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Jun 30 21:57:47 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jun 30 21:57:47 2016 +0000 |
tree | 94b0baa2df3b1ae37225948a0f746b04d9e96838 | |
parent | 30c8f7cf7af84eb86fdd051b5926f70a12e1d405 [diff] | |
parent | 96cf13a10bd067e9e29df993737bc193fc17737a [diff] |
Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am: 80eee73afb -s ours am: a461b81a54 -s ours am: 96cf13a10b -s ours Change-Id: Ic6ff81c3fb2e680ceaa84d1d6d85c8947fe0cf48