tree e5aaebd55dbd998225099a0f63f71ff9e9457d85
parent 47ee8fa42a8ea6b952880958d7e450a0ac46b8ce
parent d414ae465e3815c1b6135b9b788da68f1336f33c
author Tao Bao <tbao@google.com> 1490299342 +0000
committer android-build-merger <android-build-merger@google.com> 1490299342 +0000

Merge "Fixed scanf modifier" am: 577c668861
am: d414ae465e

Change-Id: If548f8240521dacba70e969f625728160d2bde2a