OSDN Git Service

am c728e0d8: (-s ours) am c9eaab1b: 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)
commit209f973b587d1ca69455a7e8d70790b8752ad4d6
tree6b475436496ddc7cfa2386232f644f9ff991476f
parent9160ff528cd0615f2eed07c4299ca4fdcce0f092
parentc728e0d8ce84bb31b19a29a0a0b7dc422ba24281
am c728e0d8: (-s ours) am c9eaab1b: Merge remote-tracking branch \'toybox/master\' into HEAD

* commit 'c728e0d8ce84bb31b19a29a0a0b7dc422ba24281':