am affeaaed: am bbdc4ce2: Merge "clean up and add javadocs" into honeycomb

* commit 'affeaaed8ef0776455fbecbf70627df3dd842030':
  clean up and add javadocs