tree 4c6edd8323a7b1829054d9a48817fd9d71bb2e50
parent e990d49534bb61606bcf3e61fa3c26e088d1b854
parent a547c4516c1a2dfd87f3466fccffd5ca6c5cab8c
author Adam Cohen <adamcohen@google.com> 1438377014 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438377014 +0000

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

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