| commit | f6e70c4ca3be879a4eb6e507a08ec455db9b056a | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Thu Aug 27 11:37:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:37:29 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | 7846a20f5a31ce66ef976419234e8e146a8ebc89 [diff] | |
| parent | e40de18fadce971bf211672e24d347628d78940e [diff] |
am fcbc32de: (-s ours) am 00599eca: am e84205bf: Merge "Revert "Turn on -Wformat-nonliteral."" * commit 'fcbc32de34ceea570824b98f243d40a228df1989':