tree 74867cf8663dae2d8e271ebfa46aefb9ba512481
parent 4bff9cee939bfa4eb539b229455d78eb6c83cb08
parent d927351738285e17d0be3b4de6f90107e27764ec
author Xavier Ducrohet <xav@google.com> 1425404770 -0800
committer Xavier Ducrohet <xav@google.com> 1425404770 -0800

resolved conflicts for merge of d9273517 to lmp-mr1-wfc-dev

Change-Id: I1fb8204003e0d69fcca2013a63523ceb33069d5b