| commit | c091c0e945bcb9346cfd10da763a03f72f68df02 | [log] [tgz] |
|---|---|---|
| author | Jesse Hall <jessehall@google.com> | Fri Oct 31 22:58:46 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 31 22:58:46 2014 +0000 |
| tree | 6ba69a5a1092b11bf3251e7b0a747d96668f7368 | |
| parent | 0684ff9e65012431d2c4af52a02cad84ca22b0c5 [diff] | |
| parent | 3170581704fa59a8672262c0e6c68f455d470214 [diff] |
am 31705817: resolved conflicts for merge of 04c9683a to lmp-mr1-dev-plus-aosp * commit '3170581704fa59a8672262c0e6c68f455d470214': surfaceflinger: fix -Wmismatched-tags warnings