tree aa427df01c087a670ccee1c06f4ddb5bbe2fe536
parent 6b309744de556bee7d15f31600ac154dd9115ed1
parent ec2c0359ecc1225ea8d15bd16fd6e01d5c006933
author Lajos Molnar <lajos@google.com> 1525952064 -0700
committer android-build-merger <android-build-merger@google.com> 1525952064 -0700

Merge changes from topic "AMsgItem" into pi-dev
am: ec2c0359ec

Change-Id: I5d390daf7337629828e985094a1ea5fa5510b036