OSDN Git Service

am 65834183: am fad4676b: (-s ours) am 6190a0c3: back port cc6be0a3: wrap make. do...
authorEd Heyl <edheyl@google.com>
Sun, 20 Jul 2014 18:01:03 +0000 (18:01 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 20 Jul 2014 18:01:03 +0000 (18:01 +0000)
* commit '65834183bf18a5c03a8d7faf73c2a36fd008c99a':
  back port cc6be0a3: wrap make. do not merge


Trivial merge