tree e7d9727b441c1a1162a2966dbb692bd94a47703b
parent 6458c80c006ad5124e534ddc6d4de42811e7fb31
parent d247f4732b2d1d06cec9308dc7c0bc57ab228bec
author Konstantinos Menychtas <kmenychtas@google.com> 1438984047 -0700
committer Konstantinos Menychtas <kmenychtas@google.com> 1438984047 -0700

resolved conflicts for merge of d247f473 to jb-mr1-dev

Change-Id: Ib123931dc40f5feab99eb081a68993e94ba321f6