tree 4b1b6da30d14977b9ef13a35c407083c22b1de54
parent de6db351961f18aa2e0239faa25a3806f91e8646
parent d0a4254dbebea76fe0d05671680008622e5d7b46
author Dimitry Ivanov <dimitry@google.com> 1463695094 +0000
committer android-build-merger <android-build-merger@google.com> 1463695094 +0000

Merge changes I4a37ec68,I91085cd2
am: d0a4254dbe

* commit 'd0a4254dbebea76fe0d05671680008622e5d7b46':
  android-22: add missing ns_* sybmols for lp64
  Copy libc symbols from android-21

Change-Id: Ie470935a3427cb3c2ee329d369d1a136ec16bf4e