tree bae4103999afba4e827ca4483893d9aa0016bc54
parent 87534f4ac95ab481ca682ef34a7b6ee7767bbb3b
parent db9f504522e54a8dd75ed643beee6aa62d9b9707
author Sungsoo Lim <sungsoo@google.com> 1469818229 +0000
committer android-build-merger <android-build-merger@google.com> 1469818229 +0000

DO NOT MERGE: Fix CTS regression am: 90be39c7bb
am: db9f504522

Change-Id: I83a02495ec4116d2bc2001325037f5864bb92c9a