am 3af26f43: am e69eaa22: am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag"

* commit '3af26f43dc55563842cee8604f1e802bf40a2585':
tree: 191c1bb731c33d7d8073e7c191ae9ceac1d251b2
  1. java/
  2. src/
  3. Android.mk