tree b937e3a4d97bbd95aacaddaa5b2fbeddad5ef642
parent 184c8409dcab8adbec09ac47dc7bf2587e56cbb2
parent b0749eb70cc689b5d76d5e067cf819409df76b3e
author Neil Fuller <nfuller@google.com> 1509101727 +0000
committer android-build-merger <android-build-merger@google.com> 1509101727 +0000

Further fixes to OEM templates am: 5ea1946f81 am: 9f39661740
am: b0749eb70c  -s ours

Change-Id: I3a623f452648afffa2aa0e07e41627c6e5e1fc37