tree 452eeb40c1b02e6947b10fa294296175127d9de1
parent 7d347a67fe054dff58f6714ac2f793768f04c3c5
parent 838b61c11f7e02a43e42ea1747eb3ee8b1afcb90
author Dan Shi <dshi@google.com> 1490898774 +0000
committer android-build-merger <android-build-merger@google.com> 1490898774 +0000

Merge "Add test config to libcutils_test_static" am: c65f842cd1 am: ad6c88f108
am: 838b61c11f

Change-Id: I9807d9ddda80ea8c57db07d01bae5d6ecfa142c1