tree 2e8bd845eb01f7f3de1d7518005e600d969f2efc
parent d2173f63c351aa79dcb256835b624799cf9f82c2
parent 47400c5e340b2d6ade58f68e8d2b1851d881910e
author SzuWei Lin <szuweilin@google.com> 1497431524 +0000
committer android-build-merger <android-build-merger@google.com> 1497431524 +0000

Merge "Add more libs into generic AOSP system image" into oc-dev am: 57fb2214ab
am: 47400c5e34

Change-Id: Iffefb631653a13b7c0d334aadffe30010114b10d