commit | 4dc2586e6a0fb4228e57fe3dc764c95d29cb166c | [log] [tgz] |
---|---|---|
author | Keun-young Park <keunyoung@google.com> | Thu Jul 06 01:13:49 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jul 06 01:13:49 2017 +0000 |
tree | 286c7f0b0762cc9c7268d65f5347ee7dc8fa4fcb | |
parent | 7c99e8677c19b873f0147f48510b8ac0896b96ac [diff] | |
parent | 12b9cd6e2ed0444b924b1a19e992a1dcb7bf8d1e [diff] |
Merge "Merge "add "shutdown critical" to service" am: b3915d113d am: a4ad5d0328" into oc-dev-plus-aosp am: 61ce9b3bad Change-Id: Ib70ec4ba0b92814e4295b3875b6e88d994e3c788