OSDN Git Service

am b1955cc4: am 56d790fc: am c65cbf97: Merge "Fix <sys/resource.h>."
authorElliott Hughes <enh@google.com>
Thu, 9 Jan 2014 19:21:56 +0000 (19:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 9 Jan 2014 19:21:56 +0000 (19:21 +0000)
* commit 'b1955cc44776dc272eece253e72b567ce32aa185':
  Fix <sys/resource.h>.


Trivial merge