OSDN Git Service

am 00ae9f9d: (-s ours) am a09310a6: Merge remote-tracking branch \'toybox/master...
authorElliott Hughes <enh@google.com>
Thu, 27 Aug 2015 10:50:09 +0000 (10:50 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:50:09 +0000 (10:50 +0000)
commit9160ff528cd0615f2eed07c4299ca4fdcce0f092
tree6b475436496ddc7cfa2386232f644f9ff991476f
parent6586668e88ad991f306e8f33d6d9cb13176de526
parent00ae9f9db7439892301987bf93005588b7b67857
am 00ae9f9d: (-s ours) am a09310a6: Merge remote-tracking branch \'toybox/master\' into HEAD

* commit '00ae9f9db7439892301987bf93005588b7b67857':