tree 4afb70dd6b89f22de50484c6f206df2058bfa9c7
parent a4c42802df0e2245a6915e9a850a0ad10f35225c
parent ee8746daba45a79e32bfb0946f4ac9677cc4cafe
author Andrew Hsieh <andrewhsieh@google.com> 1333352509 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1333352509 -0700

am ee8746da: Merge "ndk: libc: Add RLIM_RTTIME to <asm-generic/resource.h>"

* commit 'ee8746daba45a79e32bfb0946f4ac9677cc4cafe':
  ndk: libc: Add RLIM_RTTIME to <asm-generic/resource.h>