tree ac5283062b6b9f9c12e68df699672b747384c981
parent 25782fae9b58b691642b548ac831ccdafddc425d
parent e0316fc7a82347026caf4e1f5c8f0e8ecaf1b391
author Sungsoo Lim <sungsoo@google.com> 1469821680 +0000
committer android-build-merger <android-build-merger@google.com> 1469821680 +0000

DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092  -s ours am: 6489d870d7  -s ours am: 2dbb64594a am: b6a3e8ce8e am: b8d3dd2472  -s ours
am: e0316fc7a8

Change-Id: I0047256a9e88bedc24389de46c0e9f92430fe607