tree fe4de8b0a042ada83940954a78b1c0118183e4fb
parent ec6676ddf682e22dfb56aa54359c9480dfa661d3
parent 0e2049cd3905aac54496d14355117f8325e37357
author Deepanshu Gupta <deepanshu@google.com> 1397674712 -0700
committer Deepanshu Gupta <deepanshu@google.com> 1397674712 -0700

resolved conflicts for merge of 0e2049cd to klp-modular-dev

Change-Id: I518e18d0c769a4cb5d325fc22165a8ead36e11de