tree 20c20a106edc47b8ce93119e1d6bf03a1de1c98e
parent 8aae9d96e8738ea3959924cfd4163131b1256f98
parent 4a8afa745440b6c1b1c12c672f86c5b8a95b2b26
author Linux Build Service Account <lnxbuild@localhost> 1375398632 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> 1375398631 -0700

Merge "power: power supply framework : add warm and cool properties"