tree b6ab4118f4fd1ea52845f8f5d070141f2179dad5
parent 6d6d58645557632c026f7eaa99ebbb47c929ccb9
parent 8449c0b73245062519ce7780793dd08e888dffa5
author Jean-Baptiste Queru <jbq@google.com> 1361308444 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1361308444 -0800

am 8449c0b7: Merge "JDK cleanup"

* commit '8449c0b73245062519ce7780793dd08e888dffa5':
  JDK cleanup