OSDN Git Service

am d0b9ade9: am 771f012e: (-s ours) am 4c5b176c: Merge "bundle init.rc contents with...
authorTom Cherry <tomcherry@google.com>
Thu, 27 Aug 2015 14:43:10 +0000 (14:43 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 14:43:10 +0000 (14:43 +0000)
commitea7a401b3dcf51ef9fb68d9f56c4892e721131fb
tree23cc56c57eaae8cb3e9a9f81bdb7e881a5389b5f
parentb62c1ca9881d9c63edc5283fa068b01a15caba13
parentd0b9ade914cf3b91e30f929e9aa33156ccc39b0e
am d0b9ade9: am 771f012e: (-s ours) am 4c5b176c: Merge "bundle init.rc contents with its service"

* commit 'd0b9ade914cf3b91e30f929e9aa33156ccc39b0e':