tree 7fd1a04747939246a0a3d546ce54d75431d124dc
parent adc10102492a3d46478d6687a3cfcc4d6488c1fb
parent 8e192f626edb59d106d73f8f7894823c47457f82
author Elliott Hughes <enh@google.com> 1428021100 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428021100 +0000

am 8e192f62: Merge "Fix Windows strlcpy.c build."

* commit '8e192f626edb59d106d73f8f7894823c47457f82':
  Fix Windows strlcpy.c build.