tree 009b0c7c26db93c961630bfb6093653facbafe8b
parent 9828fc36f7f4b6dc3fb616d815dd52b61447dc15
parent 6a5c28d5afad858ad3b8a2f86dcff5173fd79595
author Dan Shi <dshi@google.com> 1491374854 +0000
committer android-build-merger <android-build-merger@google.com> 1491374854 +0000

Merge "Add test config to libcutils_test" am: c1c0de3945 am: 0b842b37f6
am: 6a5c28d5af

Change-Id: Ia86da758ddabdff2126de7758a5ad98a98802d31