tree 212557a3c1bd2423096b7d2febd9b6096e5edf72
parent d54994a45f1be37cdd7d3ff184027dd57f416703
parent d19f2d859f744ded5a70cf0d8a23427eac7ec817
author Elliott Hughes <enh@google.com> 1405130795 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1405130795 +0000

am d19f2d85: am 76df69d1: Merge "The err family allow null format strings."

* commit 'd19f2d859f744ded5a70cf0d8a23427eac7ec817':
  The err family allow null format strings.