| commit | 62ba538b940ab0f69991fbc949bed513e0548d6e | [log] [tgz] |
|---|---|---|
| author | Jinsuk Kim <jinsukkim@google.com> | Sat Oct 11 07:23:18 2014 +0900 |
| committer | Jinsuk Kim <jinsukkim@google.com> | Sat Oct 11 07:23:18 2014 +0900 |
| tree | adb36e428e245ebddce339293acf9865adc60bce | |
| parent | e61e68d001ac858d87a7f639515f12c3eafcd297 [diff] | |
| parent | 3170c03543e4be7bb82194a84949d920ffe1b82e [diff] |
resolved conflicts for merge of 3170c035 to lmp-mr1-dev Change-Id: Ia34a304451f0dd7148d6d0cbd1d8c8ca81001b86