| commit | 7976b2be9e41dbf789ad31b331e355a0a949d00a | [log] [tgz] |
|---|---|---|
| author | Bart Sears <bsears@google.com> | Fri Jun 06 14:21:28 2014 -0700 |
| committer | Bart Sears <bsears@google.com> | Fri Jun 06 14:21:28 2014 -0700 |
| tree | e50e085957ae02970dab23397e43182f78e57ded | |
| parent | 3f1b5c52d27165fc5aa0fbf443f10e8ad3e81ab7 [diff] | |
| parent | 0e23c5e3058535441d7f9b21c2051347364a379a [diff] |
resolved conflicts for merge of 0e23c5e3 to klp-modular-dev Resolve merge conflict from changing PLATFORM_VERSION from 4.4.3 to 4.4.4 in klp-dev. Resolved the conflict by skipping the merge since we want to leave klp-modular-dev as 4.4W.