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)
* commit 'd0b9ade914cf3b91e30f929e9aa33156ccc39b0e':


Trivial merge