tree f58a9d39091e0416b72d54d96b684a642192c393
parent b638126ed3c704ac65024597af952fd45e165410
author Narayan Kamath <narayan@google.com> 1441875682 +0100
committer Narayan Kamath <narayan@google.com> 1441917059 +0000

Follow up to change b638126ed DO NOT MERGE.

Resolves delta between the kitkat and L version of this patch.
Fixes the molly build on klp-dev.

bug: 22953624
Change-Id: I696a506320f30d3d5cd95f6da35361244986cb36