tree ddeb5412aefeec8107336c7e6756279dcf119998
parent 1cf9e831a645cdac99ee861b4e8e896692c1210a
parent fe7aea725fa54c972a337f60bfc14d413a42787b
author Alex Chau <alexchau@google.com> 1439564118 +0100
committer Narayan Kamath <narayan@google.com> 1439565996 +0000

resolved conflicts for merge of fe7aea72 to mnc-dev

Change-Id: I62c49f1a0f010993aab764dcb139732dbc6a629e