| commit | 4a712bfb6f2e93287bacc348c8513d9b0da7cfcc | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Thu Sep 19 10:15:38 2013 -0700 |
| committer | Ying Wang <wangying@google.com> | Thu Sep 19 10:15:38 2013 -0700 |
| tree | 257daacd079eb58439f0ba714bee0c1b81f40ff0 | |
| parent | e77e93c6586389a9c070795ce97935ef205d87f1 [diff] | |
| parent | 70190a2b0267dd9b32fbcc891459dffa5e4c718d [diff] |
resolved conflicts for merge of 70190a2b to klp-dev-plus-aosp Change-Id: I9abcb4e258ad95912860dcae2973c4e417b05369