tree 52f9e93d8d35931c56e768c8081dceab9cf12d63
parent 58423152d9e7791dddd124c235db5f693638bbd6
parent a1e28f2912c48b2247c4b9c46005ed209975c7c6
author Miao Wang <miaowang@google.com> 1489639807 -0700
committer Miao Wang <miaowang@google.com> 1489640101 -0700

resolve merge conflicts of a1e28f29 to master

Test: mm
Change-Id: I2224d1f14e6a030d231f490922b4661b034e6bf1