tree 987414730594850950c519e1e53fa5d0571583fd
parent d53c1c970c0ab7d479fe3d34fc9d06acb929a343
parent 7a12c1c6d92bf1a201ea028b026b601eedae2bce
author Dan Albert <danalbert@google.com> 1478697495 +0000
committer android-build-merger <android-build-merger@google.com> 1478697495 +0000

Merge "Revert "Remove all prebuilt NDK system lib modules."" am: 88c70cd610 am: 3d326529a1 am: 529870a900
am: 7a12c1c6d9

Change-Id: I4ce601818cec7fd263edb844eb93337d16287b29