tree c59713c6a77854f1209383cb9a90eb4e585dad37
parent d8b510ad324b2af51737a101e1989f0a7000b80f
author Adnan Begovic <adnan@cyngn.com> 1444173965 -0700
committer Adnan Begovic <adnan@cyngn.com> 1444173965 -0700

Add temporary hack to help with merge resolution.

Change-Id: I1207daf17c2bd3f7f18e35a7705635752535942f