tree 6efcff109ed30bd049071e886157dc677b077856
parent ce77e47b2f9dfa097e544c3746b8c82d65f3bfe4
parent 9c6157c81d123d8c6ba1aa8d7ee5c67b0840666c
author Colin Cross <ccross@android.com> 1447973900 +0000
committer android-build-merger <android-build-merger@google.com> 1447973900 +0000

Merge "Update libc/Android.bp to match libc/Android.mk"
am: 9c6157c81d

* commit '9c6157c81d123d8c6ba1aa8d7ee5c67b0840666c':
  Update libc/Android.bp to match libc/Android.mk