| commit | 5e8ef0460dfca1e3806b491fa886995baf0cfe9c | [log] [tgz] |
|---|---|---|
| author | Tor Norbye <tnorbye@google.com> | Mon Apr 28 15:59:37 2014 -0700 |
| committer | Tor Norbye <tnorbye@google.com> | Mon Apr 28 15:59:37 2014 -0700 |
| tree | f51121e1040f992a31f9e8687af40053b05ff501 | |
| parent | bc9c554abc4d17e0788be2cdc5321c9d865897ec [diff] | |
| parent | a3ff3273e976adf19770651dcf473fa67b38eb22 [diff] |
resolved conflicts for merge of a3ff3273 to klp-modular-dev Change-Id: Idc0fdf6c997ef63c14e4d8df417d1179cdcb1403