am c65ad165: Merge "Fix "error: \'strerror\' was not declared in this scope"."
authorElliott Hughes <enh@google.com>
Sat, 31 Jan 2015 07:49:20 +0000 (07:49 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 31 Jan 2015 07:49:20 +0000 (07:49 +0000)
* commit 'c65ad165e47ae46e53fed07b576ff5efbf47b1c8':
  Fix "error: 'strerror' was not declared in this scope".


Trivial merge