tree 99975cc268796913ec025ec69317818f3d900ab5
parent a3818107e88d92256d3879f21cdf1602c9ccd4c6
parent 74e3fe4cd41f4846ddacef9235dbae826eeae83f
author Treehugger Robot <treehugger-gerrit@google.com> 1513051522 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1513051522 +0000

Merge changes If54d9c69,Ibc253514

* changes:
  Fix PathForPhony
  Allow java manifest property to reference filegroups