OSDN Git Service

resolved conflicts for merge of 88b2790d to lmp-sprout-dev
authorAmit Mahajan <amitmahajan@google.com>
Sat, 11 Oct 2014 00:15:48 +0000 (17:15 -0700)
committerAmit Mahajan <amitmahajan@google.com>
Sat, 11 Oct 2014 00:17:53 +0000 (17:17 -0700)
Change-Id: I4f43133131aa7ef8eeec97edc993da06c1883903


Trivial merge