tree cd0bd9ffb2c74c5a4a1d4352a309204278cfdf1c
parent 4780c8cbc15a8b6fc69cd75a68619ee5c8a68793
parent be25045e37c370a63b0e01843356743dfa340839
author Neil Fuller <nfuller@google.com> 1483573235 +0000
committer android-build-merger <android-build-merger@google.com> 1483573235 +0000

Merge changes from topic 'asm5_apigenerator' am: dfa8fc46ef
am: be25045e37

Change-Id: I2e5eabb0f1b255e7075f12800988474d4f4fec58