tree 691ce873c7e20df40de4c43084bd3197add4939e
parent 710367fc6bf2e19b75e9f0d6490cc462e392739a
parent ac8f2206b6dd37000693ac38c16d883d9214473c
author Tom Cherry <tomcherry@google.com> 1495139691 +0000
committer android-build-merger <android-build-merger@google.com> 1495139691 +0000

Move to Android.bp am: 8d225d8f4e am: d314b3b72f
am: ac8f2206b6

Change-Id: I435131fc115eab3c63ba76555a5817ac7fa419ac