tree ced81858886c85f602cfe94cc88ff367b32c16b1
parent 30546fc0a2e0d0371dd4854d83a73e7a1eda51a8
parent 9e0fcdb41238363d78b7fd9bef4124f84a9a4590
author Sunny Goyal <sunnygoyal@google.com> 1435798109 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1435798109 +0000

am 9e0fcdb4: am 1d8f4ad5: Revert "Add "option javanano_use_deprecated_package = true;\n" to protos compiled with the nano proto compiler that are referenced in Java files."

* commit '9e0fcdb41238363d78b7fd9bef4124f84a9a4590':
  Revert "Add "option javanano_use_deprecated_package = true;\n" to protos compiled with the nano proto compiler that are referenced in Java files."