JP Abgrall 0852bee4a9 Fix CTS build ...

Revert "Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev"

This reverts commit 9feaaaf446, reversing
changes made to 65fbe1fcd153c5647f8d1e1a7443b3f04b7b25fd.

2015-07-14 19:13:31 -07:00

..

cts

Fix CTS build

2015-07-14 19:13:31 -07:00