tree 50ad8ccc8f774d373b3a004dddc8c7d0b2096520
parent f0a4855c2f6331690bee33db9b5a83de816921bb
parent 94fa20058fbd0e4f7e3c6d1381cdb9718dd90cde
author Riley Andrews <riandrews@google.com> 1403228147 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403228147 +0000

am 94fa2005: am 4f5392cb: Merge "Make indentation sane in init.rc"

* commit '94fa20058fbd0e4f7e3c6d1381cdb9718dd90cde':
  Make indentation sane in init.rc