OSDN Git Service

am 7fbf06c2: am 2af0bb6e: Fix merge discrepencies and resulting compile errors
authorAndre Eisenbach <eisenbach@google.com>
Mon, 19 Oct 2015 19:09:45 +0000 (19:09 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 19 Oct 2015 19:09:45 +0000 (19:09 +0000)
commite37a780798cf0179f10b7baec1f48114944b7749
tree0996764bc8508158c4eb211b0b0b731c465fc4a6
parent629f9555ee20a310b62bcc13427aec1fc2a0efcf
parent7fbf06c2ba7a57d38e567c36941d5aca8c906b71
am 7fbf06c2: am 2af0bb6e: Fix merge discrepencies and resulting compile errors

* commit '7fbf06c2ba7a57d38e567c36941d5aca8c906b71':
  Fix merge discrepencies and resulting compile errors