tree 594a5aaf48958a116ea8be45a5b0c08566b9de7a
parent 40b274915ef47c0dff65e21bb729b7ccf1764ad5
parent f0435e183906dc39432fb4c937854d3737de3adc
author Kirill Grouchnikov <kirillg@google.com> 1494889860 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1494889869 +0000

Merge "Tweak test app makefile with extra resources" into oc-dev