Merge commit '9bd0272d004aabece70774113d1ff6d9dbf1301c' into HEAD
authorKalle Raita <kraita@google.com>
Fri, 28 Apr 2017 23:26:40 +0000 (16:26 -0700)
committerKalle Raita <kraita@google.com>
Fri, 28 Apr 2017 23:26:40 +0000 (16:26 -0700)
commit8e532829e0ca6feb4cbae98b3e0ee0b429dd7567
tree06c5f78f0a3dd44fb051272ccd91eb7b9f4a5b29
parentf410beadf25b75071dbc4490aca2293cb0d595a5
parent9bd0272d004aabece70774113d1ff6d9dbf1301c
Merge commit '9bd0272d004aabece70774113d1ff6d9dbf1301c' into HEAD

Test: check_build_sanity.py
Change-Id: I83a7e6b3626bcf5a51af5a4bfe49f727bd2c4da1
framework/common/tcuApp.cpp
framework/common/tcuApp.hpp