tree 1edce75347587d117e3433692f0e98a8b373c9ee
parent 9794af49a38d89d3fd20e8fd37e112dcbe73845a
parent fc1036e36ea3eff7a1e6081cef1749507e28f1bf
author Linux Build Service Account <lnxbuild@localhost> 1349808175 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> 1349808174 -0700

Merge "msm: ultrasound: add support for proximity"