tree f16946fa3de1660808d074a31c75a52ac570a1da
parent 7b97351b68e96ea67380140266abb897fe1be57d
parent 1495ceb88594bf3c5963ef65ee12953dc0354546
author Jesse Hall <jessehall@google.com> 1414774724 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1414774725 +0000

Merge "surfaceflinger: fix -Wmismatched-tags warnings" into lmp-mr1-dev