tree 52ea94569acc7caea108f0be384bdbb244707cdd
parent 5219726d7fb99a84764becfe632108b2f66f6376
parent 0871e0029fba1d797caf8ae8944ac6f93dcea781
author Jiyong Park <jiyong@google.com> 1489458404 +0000
committer android-build-merger <android-build-merger@google.com> 1489458404 +0000

Merge "fix: cannot determine the type of modules with class 'samples'" am: b1331938a3
am: 0871e0029f

Change-Id: I99c7199e7a037e123a6a66e442874c86780def6b