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)
commit8151ef29aa80006b7597ed57d507fe48338110c7
tree33d4a1e35fad4ae705882b9a63297b82fbacf38e
parent8541206e6bbc08f5e5bc7d545fcdce38ff853f8e
parent88b2790d734504389156111002d8c5bd162d9b9c
resolved conflicts for merge of 88b2790d to lmp-sprout-dev

Change-Id: I4f43133131aa7ef8eeec97edc993da06c1883903