tree 1b48c9b714d53c677468690edcdaa5939faab4d9
parent 2a71444bf7d58374654060dc3f205611a0a2efc3
parent 9268914ae163fbb60c63ab16aba6906c9c92e35c
author Steve Muckle <smuckle@google.com> 1508044416 +0000
committer android-build-merger <android-build-merger@google.com> 1508044416 +0000

Merge "convert to Soong, static library" am: 168a87ba95 am: 7ee71735df am: e1c4f45c70
am: 9268914ae1

Change-Id: I0f0e723c251a6ff175edf8f93c6dc660ab5e4a5e