| commit | cf72f25981606b4e48130890f22f713d41e0d420 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Wed Apr 16 14:37:06 2014 -0700 |
| committer | Deepanshu Gupta <deepanshu@google.com> | Wed Apr 16 14:46:24 2014 -0700 |
| tree | 10a78840c7f5530732a2f7039ab90fa76e7a9202 | |
| parent | 3ee9dc58e5e1e39fac184b98cac0c7c46af72dd9 [diff] |
Fix incorrect merge conflict to klp-modular-dev-plus-aosp resolved conflicts for merge of ec6676dd to klp-modular-dev-plus-aosp properly, originally fixed in 35d46778f49c962c990cfc17e521aa80b9e0c016 Change-Id: I5d1abf641564ea19d283f60385d39f7670a2f22e