tree 36fceda87f238a7b534acafca254fe0bd46a94d7
parent a74560aaf6a8861cbb81a8a6a7c66b323cc6417c
parent 757884d3a8acac08a4d6da4bbbc8794278f7c8de
author Tao Bao <tbao@google.com> 1507742256 +0000
committer android-build-merger <android-build-merger@google.com> 1507742256 +0000

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

Change-Id: Ifd89583530d08a0f37095ffb836605ea0c0131f3