tree beaf911a267c787aa31c35804dac8378bbb698ac
parent 3abba995a27a515d7199e593f8aee3ba815d8bda
parent e2a369a34f68368b3a5881610e5ae048eaf93230
author Wu-cheng Li <wuchengli@google.com> 1274345423 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1274345423 -0700

am 2ee95ad6: am 5badcaba: Merge "Fix javadoc of camera focus distances API." into kraken