tree 8d9a52dc6c00cb7237a832d9dfe9fcc8b3f8d4be
parent c3d4308528852d8c502f98f3393f6df1e3865383
parent 79c5c5d792cf925afa4ed2465a96553d60a844bd
author Elliott Hughes <enh@google.com> 1428368807 -0700
committer Elliott Hughes <enh@google.com> 1428368807 -0700

Merge remote-tracking branch 'strace/master' into HEAD

Change-Id: I71324955ac973323aa790485c240e553272ff266