OSDN Git Service

am 9f5e9ec7: (-s ours) am b9ac485a: am 49948146: Merge "bundle init.rc contents with...
authorTom Cherry <tomcherry@google.com>
Thu, 27 Aug 2015 10:42:11 +0000 (10:42 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:42:11 +0000 (10:42 +0000)
* commit '9f5e9ec76ab7c0698469ec75785294aa94480f57':


Trivial merge