tree 5727ef6e1036e0747062abb09960de8d3e260e27
parent 709d7e49ddfcbd4d02658d19f87a185a029cb9bf
author Aaron Whyte <awhyte@google.com> 1401756975 -0700
committer Aaron Whyte <awhyte@google.com> 1401756975 -0700

Fixes CTS test, matching Master.
Bug: 15131296

Change-Id: I0163d324062e605eadc611b634c11d2ff27434e1