tree 07836022b877bc250cf50f9511bd3d20a55e07bb
parent 2f768b045e8590cae2f674d8dfd47fbfe2e6c373
author JP Abgrall <jpa@google.com> 1436925580 -0700
committer Bart Sears <bsears@google.com> 1436926411 -0700

Fix CTS build

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

This reverts commit c88194007596171b68624e08c055f796ed750b05, reversing
changes made to 65fbe1fcd153c5647f8d1e1a7443b3f04b7b25fd.