am 60eb73ed: (-s ours) am 54b22ca2: am ff5be396: Merge changes from topic \'init-rc-breakup\'

* commit '60eb73ed6a537c79f57bf03f1c3c7ebd04f409ea':
This commit is contained in:
Tom Cherry 2015-08-27 11:54:51 +00:00 committed by Android Git Automerger
commit f3c12f4d7d

Diff content is not available