2 commits

Author	SHA1	Message	Date
Tom Cherry	984bd8323d	resolved conflicts for 5caca3dd to mnc-dr-dev-plus-aosp ... Change-Id: I773e514a8232b77cdd566dc36c9efc4e15f206f0	2015-09-21 14:25:34 -07:00
Tom Cherry	20391b1de5	bundle init.rc contents with its service ... Bug: 23186545 Change-Id: I52616b8ab1165fdef716f9b8f958665f2308c12e	2015-08-21 10:14:43 -07:00