tree a45b2af3f3ff61f8bcd7d51cba7b7b80e9157d31
parent 59a4978c1cc5affbec43acf0d1785d50e871e7da
parent 2d201fc34bf048ff82a5fc33c8d26351270fef8b
author Treehugger Robot <treehugger-gerrit@google.com> 1467831837 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1467831837 +0000

Merge changes I1ee1ee05,Ieb6d9f68,Ia3d77625

* changes:
  Add atrace and multinetwork symbols to android-23.
  Copy libandroid.so symbols from L to M.
  Revert "Add atrace and multinetwork symbols to NDK"