tree 95e0e2b1fe6dfa8e7d4624d94ced5610ff982f1d
parent 2fd720fd0a18dc5e0e7c1a5ee3ee6fffaa960d35
parent 0ec050af98e7e3e60d0b5a2a98a5b1c381b7f77c
author Ying Wang <wangying@google.com> 1280172345 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280172345 -0700

am 0ec050af: am f581c1ea: Unbundle libstlport with NDK r4.

Merge commit '0ec050af98e7e3e60d0b5a2a98a5b1c381b7f77c' into gingerbread-plus-aosp

* commit '0ec050af98e7e3e60d0b5a2a98a5b1c381b7f77c':
  Unbundle libstlport with NDK r4.