Merge "Updating Idegen project to use JDK 1.7" am: 72f24a0fa1
am: f499ad0961

* commit 'f499ad096171639c013c0ec21f730ed25da34998':
  Updating Idegen project to use JDK 1.7