am 63de4562: (-s ours) am d9818244: (-s ours) Merge "DO NOT MERGE: Make...
am 63de4562: (-s ours) am d9818244: (-s ours) Merge "DO NOT MERGE: Make component names visible in javadoc." into ics-mr1
* commit '63de4562':
DO NOT MERGE: Make component names visible in javadoc.