| commit | 62a22d5b1f94f5ec6d48fa8924297c5551372680 | [log] [tgz] |
|---|---|---|
| author | xinhe <xinhe@google.com> | Wed Nov 19 11:39:34 2014 -0800 |
| committer | xinhe <xinhe@google.com> | Wed Nov 19 11:48:43 2014 -0800 |
| tree | 93476ab37fc4a75248a507818caf80b42ece54cd | |
| parent | 5fafd21b1f15930b729f067be7d2c584add3217b [diff] | |
| parent | 046f3843f10f076b5df2fe58f8f15a456e6bb6dd [diff] |
resolved conflicts for merge of 046f3843 to lmp-sprout-dev(DO NOT MERGE) The change is already in MR1 branch Change-Id: I4ae35a8f76fdc2d4b1cdf2773dc27ff2da85b5ff