tree 00e0aca5ea9712655b9c972369df6aa5005b70d1
parent 487c4aa33471876e3e30c7b1cde90ae577572cfc
parent 1d8f4ad59dbb17d80c6b910be8ad85904cb08d68
author Sunny Goyal <sunnygoyal@google.com> 1435797432 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1435797432 +0000

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 '1d8f4ad59dbb17d80c6b910be8ad85904cb08d68':
  Revert "Add "option javanano_use_deprecated_package = true;\n" to protos compiled with the nano proto compiler that are referenced in Java files."