tree 216e1fcbd84e2c7f2a9d18ba19930e394c7ffc19
parent 1dbe3344fc8f6bbebf1ed616255e3e295947700d
parent 46ea63c7f5f4ebfc3588480bccf86067d61f5256
author Jon Boekenoogen <jboekeno@google.com> 1412044225 -0700
committer Jon Boekenoogen <jboekeno@google.com> 1412044292 -0700

resolved conflicts for merge of 46ea63c7 to lmp-dev

Change-Id: Icd0fcdd90df854d5c74ace9732636a10e215074d