tree ee22e542a885779ea2771f236c6f0a55d69745f5
parent 98cdbf0d2bc1892dfe1a2e7975b185d1b4710137
parent 5a9fe2ca6769e8ab68b40aee318042cabc5e81a6
author Treehugger Robot <treehugger-gerrit@google.com> 1476725567 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1476725567 +0000

Merge "Don't generate a Java Android.mk if we don't need to."