tree 373985a2046ba6c6165471398f2b5ccf79bc440c
parent 118b3243f890cd3c05c6bd07f47f7b2fcb329c4d
parent ce10b6e2f3ec96d3fa1eeca416b3e136440b46fe
author Tao Bao <tbao@google.com> 1498706342 +0000
committer android-build-merger <android-build-merger@google.com> 1498706342 +0000

Merge "Allow packing custom radio images into target_files zip." am: 9ea6a8b817
am: ce10b6e2f3

Change-Id: I3b6f7ade42f58baa722e2ee3df81efac48a5b653