tree 41c3a387058ad08b241a92d83a348276c11c5f78
parent 82d5f137ed03dcd1020fb554a1d0f3029a826282
parent ec6676ddf682e22dfb56aa54359c9480dfa661d3
author Deepanshu Gupta <deepanshu@google.com> 1397675674 -0700
committer Deepanshu Gupta <deepanshu@google.com> 1397675674 -0700

resolved conflicts for merge of ec6676dd to klp-modular-dev-plus-aosp

Change-Id: I2fec735ba65f56da7d17022074f8924a259b4bbf