tree ae30f2a2cb0aa4aac6be286d42f30d6d97b32c79
parent d7c205fe1f7cda2cdcb3062b548c0777402bab38
parent 8a064aa83ad590b61ddd84e678c59f0d1f68106c
author Marco Nelissen <marcone@google.com> 1440095398 -0700
committer Marco Nelissen <marcone@google.com> 1440095398 -0700

resolved conflicts for merge of 8a064aa8 to klp-modular-dev

Change-Id: If031955c9edca657401831fbfa5a128f0b4c6d86