| commit | e28aef71edded3fc1976eeb83ea3a3a787683af7 | [log] [tgz] |
|---|---|---|
| author | Jeff Hao <jeffhao@google.com> | Fri Mar 14 14:21:02 2014 -0700 |
| committer | Jeff Hao <jeffhao@google.com> | Fri Mar 14 14:21:02 2014 -0700 |
| tree | 767a8ac75ec0e5c394e1f8e792ebdf002a03bb98 | |
| parent | ee1400fb6565bfba2d3ccd5f66852986833b9c7b [diff] | |
| parent | 27d08a924481389a45d5fbca43ffdc72496038d1 [diff] |
resolved conflicts for merge of 27d08a92 to klp-modular-dev Change-Id: I44917e6a1c58e44692e2fcfb4a52beb521c94c4c