| commit | cbe99b35a0ddd174f9dd796b66b7aa8ff18962fc | [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 | 4aae172dd065e941dea254c7ab0c5f46a15c9df1 | |
| parent | 3dcee3120b5bacc82f16865ddc7525d4379842f6 [diff] |
Pre-import to remove a conflict. Test: compiles and passes checkstyle Change-Id: I1ffdd88e6268fee0cf88992420ab21eb42928957