am 84b4a253: manual merge for N5 FW(6.37.32.RC23.34.40)
authorNavtej Singh Mann <navtejsingh@google.com>
Wed, 2 Sep 2015 21:02:13 +0000 (21:02 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 Sep 2015 21:02:13 +0000 (21:02 +0000)
commitff4ce052aaaec92e2c8dacda227e81ef4a550bc0
tree54b184b9446315bb8b02256edb993478f214c252
parent3559091380edc013862e07f2ee3be54ac2cb77d6
parent84b4a2539edf9414b539c3c935084df376ba2d7a
am 84b4a253: manual merge for N5 FW(6.37.32.RC23.34.40)

* commit '84b4a2539edf9414b539c3c935084df376ba2d7a':
  manual merge for N5 FW(6.37.32.RC23.34.40)