tree aa80ae75d9b61a1d8ba04270d47e487d91b5900a
parent 149366284918692c6dc05b7a1deb19a4e7585070
parent 519a40f731b747f1248a7443d4b5ab152572975a
author Adam Cohen <adamcohen@google.com> 1438377214 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438377214 +0000

am 519a40f7: am a547c451: Revert "Add proto flag "javanano_use_deprecated_package" to avoid build breakage"

* commit '519a40f731b747f1248a7443d4b5ab152572975a':
  Revert "Add proto flag "javanano_use_deprecated_package" to avoid build breakage"