| commit | 25f967a8a2080f23ee1e65edf8629b139611680c | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Tue Jun 14 12:21:19 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jun 14 12:21:19 2016 +0000 |
| tree | ce77a4688d19988b5371aca8fe01f4eea356ec06 | |
| parent | c8a9a78dd885fcf0fd964fa09d658939be328176 [diff] | |
| parent | 960a0a8fec63661389c15b57450168e1fe9772fd [diff] |
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: bb8b32262f -s ours am: 960a0a8fec -s ours Change-Id: Ic70bed6bffbf93f59ef07230533abd19299cab88