am 84b4a253: manual merge for N5 FW(6.37.32.RC23.34.40)
Navtej Singh Mann [Wed, 2 Sep 2015 21:02:13 +0000 (21:02 +0000)]
* commit '84b4a2539edf9414b539c3c935084df376ba2d7a':
  manual merge for N5 FW(6.37.32.RC23.34.40)


Trivial merge