tree 3702ab4af0e221e8ca59f4526e481056fe59942f
parent de256c1d21c5dd95e2ad7c7948f7b4f88e739e99
parent b785b616218f11a6863ae9917076f8464aa7125e
author Dan Willemsen <dwillemsen@google.com> 1521786465 +0000
committer android-build-merger <android-build-merger@google.com> 1521786465 +0000

[automerger skipped]Allow proto properties in cc/java_defaults
am: b785b61621  -s ours

Change-Id: I444e25311229d0e6a422e514c8f23b318715b87f