Merge "Android.mk: add a flag to control shared/static lib"
authorJames Zern <jzern@google.com>
Thu, 16 Apr 2015 03:33:03 +0000 (20:33 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Thu, 16 Apr 2015 03:33:03 +0000 (20:33 -0700)

Trivial merge