tree d2f40e14ed53c7ba4c6b67644ae091b2a1d635a0
parent a15c5ee6c8d1dc10ff2c3a0baac850c0c6b1871d
parent 5acf95965261ec18f0cc5371d95ea32189532c1d
author Colin Cross <ccross@android.com> 1498864074 +0000
committer android-build-merger <android-build-merger@google.com> 1498864074 +0000

Merge "Refactor module registration" am: 0f9f1869a4 am: d0ca61072c am: 77571b4134
am: 5acf959652

Change-Id: I509a3271e583ca9fd5419309b46215ea0e82ab27