tree d2f40e14ed53c7ba4c6b67644ae091b2a1d635a0
parent a15c5ee6c8d1dc10ff2c3a0baac850c0c6b1871d
parent 0f9f1869a4596b973fb6d65324924365d3cf5884
author Colin Cross <ccross@android.com> 1498863298 +0000
committer android-build-merger <android-build-merger@google.com> 1498863298 +0000

Merge "Refactor module registration"
am: 0f9f1869a4

Change-Id: I0aab16aa2d38f6eac9eaf863f53a2d45ca05c38b