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

Merge commit '60f3eb54a01d30882dfab5e66318d8fdd9aab1dd'

* commit '60f3eb54a01d30882dfab5e66318d8fdd9aab1dd':
  Define the URI path, columns and constants for shortcut validation.
tree: 128863e59236a2ed414cfc646dd5657ed783499a
  1. awt/
  2. camera/
  3. cmds/
  4. im/
  5. include/
  6. libs/
  7. opengl/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE