am 3fd7e13: Merge branch \'donut\' of ssh://android-git.corp.google.com:29

Merge commit '3fd7e13960c2763225c5c8bc187bd15da04820dd'

* commit '3fd7e13960c2763225c5c8bc187bd15da04820dd':
  Add new binder methods to camera client to support generic callbacks
tree: 5ae80989aa7d07fb313588b2a665cde65a987165
  1. awt/
  2. camera/
  3. cmds/
  4. im/
  5. include/
  6. libs/
  7. opengl/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE