Merge "Add a note." into dalvik-dev