tree ac3e3c792e2842dbb6185a2c2ce0f27e6b88a21e
parent e8a6e061f6108612d3a1a89efd8fe9f35d391899
parent 32da2e14c38c8b393cf5ad87e1c8b1b56a0abeb8
author Linux Build Service Account <lnxbuild@localhost> 1372320200 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> 1372320199 -0700

Merge "defconfig: msm8612: Enable light/proximity sensor driver STK3X1X"