| commit | ce1a9d8fd74ef102898a2723cd167697e271f710 | [log] [tgz] |
|---|---|---|
| author | Chalard Jean <jchalard@google.com> | Tue Jan 23 21:25:37 2018 +0900 |
| committer | Chalard Jean <jchalard@google.com> | Tue Jan 23 21:38:00 2018 +0900 |
| tree | db4876f550bb73aecca16ad7c54c2d23d380f0a5 | |
| parent | bf996dd479d933b1e6be8fae50d1517229047674 [diff] |
Pre-import to remove a conflict. Test: compiles and passes checkstyle Change-Id: I1ffdd88e6268fee0cf88992420ab21eb42928957