tree 7469a3cda59554c2ab5dc80b0948a35bfc26486c
parent 38fbb15cae5063aed76090eebabd93d39a26bf27
parent e8012038e003466bcc379ea38acdc2850979b76c
author Alex Light <allight@google.com> 1509987293 +0000
committer android-build-merger <android-build-merger@google.com> 1509987293 +0000

Change requested properties to be Android ones where applicable
am: e8012038e0

Change-Id: I23ab7c0d6fbd04ee6718491545c83e85114a6712