tree d3eb0782bdf437b46d678e95ecbe36d2d103f1ed
parent bdf11cc3d669ba7c8e330ce33e0b0a164548d43a
parent 0a4676d0dde5b69d70d1d56c6b5e177e94a5f6e7
author Steven Moreland <smoreland@google.com> 1508036505 +0000
committer android-build-merger <android-build-merger@google.com> 1508036505 +0000

Merge "fmq_test using static passthrough libs" am: 4e5a2a5a92
am: 0a4676d0dd

Change-Id: Ieb9be6913a4c42bff64a6d249c3b232cc7e2008d