am ff4ce052: am 84b4a253: manual merge for N5 FW(6.37.32.RC23.34.40)
authorNavtej Singh Mann <navtejsingh@google.com>
Wed, 2 Sep 2015 21:18:03 +0000 (21:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 Sep 2015 21:18:03 +0000 (21:18 +0000)
commitb9632e2f7f928f9b175dd7c4973c2284a1cb94b1
tree33ab82647556bdfb0694fa75e975b23ea902cf63
parent5deb0d0f879dfec89115b1bd422ecfa0aad01242
parentff4ce052aaaec92e2c8dacda227e81ef4a550bc0
am ff4ce052: am 84b4a253: manual merge for N5 FW(6.37.32.RC23.34.40)

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