tree 381d31f88ca04d15d5f83845b02cf1a04abc7ce6
parent 89fd9eccdca0eb5aed296bd7a2003424defe970c
parent a61ac5257bea15d6cbfc640c03f18c2fb808b139
author Elliott Hughes <enh@google.com> 1344881432 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1344881432 -0700

am a61ac525: Merge "Fix module constructor order."

* commit 'a61ac5257bea15d6cbfc640c03f18c2fb808b139':
  Fix module constructor order.