| commit | b338948e9ed7d46f5a2e6c1d3b7b7ad0134ede0e | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Thu Jun 09 14:39:53 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jun 09 14:39:53 2016 +0000 |
| tree | 05cc622408fbd2663151fc4ffa84c7ca68207e69 | |
| parent | e37883496a104eb7329555c87c6fe1a039b592cb [diff] | |
| parent | 2b0549e5e3f7a0d21dc2dc304bcee53450760098 [diff] |
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 8d1f3f60bc -s ours am: 2b0549e5e3 -s ours Change-Id: Ibe4315d363323fcd64aaa7002319729fb2ce2be3