tree 3a393bbad33e1fcff8533f0a23b51e8071a6a02e
parent 1f7e8f6ab67b1a2ea8388b9884c31579a29c6f0f
parent 46938bcf0cbd77b8543c3ae5779318748aee27e1
author Steven Moreland <smoreland@google.com> 1494386601 +0000
committer android-build-merger <android-build-merger@google.com> 1494386601 +0000

Merge "otautil: Android.mk -> Android.bp" am: 106ca8e93f
am: 46938bcf0c

Change-Id: I14874081d5ecfde92523fdb2487bcee239f9c664