tree fac43ee4e0e1de785c14f6eeeef94259651175a7
parent 1fcc472b3e8ef42e5e7d0644738bb568405160dd
parent 8ef8e2b64879dfd047935e40cbdcc0320f17a5b7
author Sungsoo Lim <sungsoo@google.com> 1469858236 +0000
committer android-build-merger <android-build-merger@google.com> 1469858236 +0000

Merge \\\"DO NOT MERGE: Fix CTS regression\\\" into lmp-dev am: 124cc534f8  -s ours am: 3d58e326d9
am: 8ef8e2b648

Change-Id: I245e257deb8febb49f2abd7322eb3a24db564b31