tree f0f6ef588dec7b538ae8efe0968c5288c45541e6
parent fe3a0a924bba274b8c3bdc5f937ed5507368c170
parent 748fb34d04f5af79c715b8180bbc061c6ced63fe
author Deepanshu Gupta <deepanshu@google.com> 1420583725 -0800
committer Deepanshu Gupta <deepanshu@google.com> 1420583725 -0800

resolved conflicts for merge of 748fb34d to lmp-mr1-dev

Change-Id: I729cc4282ff2b65907fd8013de270bca514c6e83