tree d593cb34b8e2adbe2c14ae99554c7d5824f3cbed
parent f4eb6a2c94c4f63b1819f25113f6e92e0caa6e9b
parent e34eb7672bbfe0b4ba2001821780211aef1dfdac
author Andrew Hsieh <andrewhsieh@google.com> 1399994369 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399994369 +0000

am e34eb767: am 430c4b16: am 8c81d3b4: am 3000c633: Merge "Disable for a while extra warnings when using [v]sprintf"

* commit 'e34eb7672bbfe0b4ba2001821780211aef1dfdac':