OSDN Git Service

am 1e75a9b5: Merge "Bionic: Make DISALLOW_COPY_AND_ASSIGN conditional"
authorAndreas Gampe <agampe@google.com>
Tue, 11 Nov 2014 19:52:55 +0000 (19:52 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 11 Nov 2014 19:52:55 +0000 (19:52 +0000)
* commit '1e75a9b56ad746ff038ca956bd3d83fe4b9a156f':
  Bionic: Make DISALLOW_COPY_AND_ASSIGN conditional


Trivial merge