tree 960d571d316aad7d326ea0bd8116b232869ea755
parent f51ae15eeb01e6b929209b4e9ceeda4541b6ab1a
parent f3bb49b02ae80a612dd7179dd15ba2c3986db912
author Sudheer Shanka <sudheersai@google.com> 1495227593 +0000
committer android-build-merger <android-build-merger@google.com> 1495227593 +0000

Merge "Update PackageSettingBase.usesStaticLibraries correctly." into oc-dev
am: f3bb49b02a

Change-Id: I308ef038e01003e6b035960ff7b5f5ca37c03772