am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."

* commit '48ee66d295979372ed0234cefda42385daae8312':
pull/91/head
Wink Saville 11 years ago committed by Android Git Automerger
commit 54e88adb94

Diff Content Not Available