tree 77f0e3df378c8a752c5be5797a1e56a45267fe2a
parent 4dd7fbee4e0c51ef4e4b60dc44641f7745c7057f
parent 1a927f46dcc43dc13ae0661cf0067eae920ff6ed
author Daniel Xie <dxie@google.com> 1433375099 -0700
committer Daniel Xie <dxie@google.com> 1433375099 -0700

resolved conflicts for merge of 1a927f46 to lmp-mr1-modular-dev

Change-Id: I2070627dc3858b2baefcfdb0e975cfb9fc50b7a0