tree bb3cef619b3fdcb286ba2bae89fe6f8d5ff65d37
parent 5d55e7c8b3f28264375d8159e2bce4a1c0a71c0d
parent 9c23fcbcd9855ead095e76fbbdc79abe98f6fea5
author David Lin <dtwlin@google.com> 1488998859 +0000
committer android-build-merger <android-build-merger@google.com> 1488998859 +0000

Merge "init.rc: remove duplicated chown entry for timed_output" am: e88882e16e
am: 9c23fcbcd9

Change-Id: Ic49ddfe13a7d0c0d56fe6b39c9cd882da740ce27