Merge "Add missing references." into dalvik-dev