OSDN Git Service

am ebf0b42f: (-s ours) am 65834183: am fad4676b: (-s ours) am 6190a0c3: back port...
authorEd Heyl <edheyl@google.com>
Mon, 21 Jul 2014 18:29:33 +0000 (18:29 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 21 Jul 2014 18:29:33 +0000 (18:29 +0000)
* commit 'ebf0b42f0561e8af832d1bed4eb3cc340de3e946':
  back port cc6be0a3: wrap make. do not merge


Trivial merge