OSDN Git Service

am 7e612cb8: (-s ours) am f41c7e0b: Merge remote-tracking branch \'toybox/master...
authorElliott Hughes <enh@google.com>
Thu, 27 Aug 2015 10:50:05 +0000 (10:50 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:50:05 +0000 (10:50 +0000)
commitbdb1a0e645e551ea918d401542b657b66c189658
tree6b475436496ddc7cfa2386232f644f9ff991476f
parentdcc1547093d5c3fc9bac4f91298dfb9307ad98ff
parent7e612cb856f90b83c0a7f48b0e087fdb32de24e1
am 7e612cb8: (-s ours) am f41c7e0b: Merge remote-tracking branch \'toybox/master\' into HEAD

* commit '7e612cb856f90b83c0a7f48b0e087fdb32de24e1':