tree 36fceda87f238a7b534acafca254fe0bd46a94d7
parent ecfb9a27819cbfef804d093c2f0fecc3de9d8252
parent 15597ad4606b815d6224e200e9b13a035be5a35f
author Tao Bao <tbao@google.com> 1507741937 +0000
committer android-build-merger <android-build-merger@google.com> 1507741937 +0000

Merge "Build both of static and shared libs." am: ec365b3787 am: 94d2512ef4
am: 15597ad460

Change-Id: I6564fe94fdf6912ac25474bd485868b58a0228d4