tree f72a73228782476bf1a9eaef3abf457028c39ee2
parent 62f2a63f61afe2bdd0da88d87a60e2b1a52b79cb
parent 0ebf84099d2a8f68dd6848f58560b5a33658d290
author Evan Charlton <evanc@google.com> 1396483093 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1396483093 +0000

Merge "Fix a bad log format string" into master-nova