tree 08975ddc9838d63aba902b865b55ea5e493f1dec
parent 1ed3edbb6039837050b9c11bb489013c5d9d7e84
parent 22422ef19470eafeebb8f66b7a263409afc13460
author Dario Freni <dariofreni@google.com> 1523981555 -0700
committer android-build-merger <android-build-merger@google.com> 1523981555 -0700

Merge "Merge manifests for LOCAL_STATIC_ANDROID_LIBRARIES." am: 569bcb26d0
am: 22422ef194

Change-Id: I86941bf9e7b6e6539b514159e04d7399ce50643a