commit | 39b9e89f34093173b91cbe1033b41c1df3424efd | [log] [tgz] |
---|---|---|
author | Keun-young Park <keunyoung@google.com> | Thu Jul 06 01:38:57 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jul 06 01:38:57 2017 +0000 |
tree | bb12a27925340995d772fb67f29961bace780d04 | |
parent | ea2e2dbf7d13709d02fa7ed3b34359a512824deb [diff] | |
parent | 4dc2586e6a0fb4228e57fe3dc764c95d29cb166c [diff] |
Merge "Merge "add "shutdown critical" to service" am: b3915d113d am: a4ad5d0328" into oc-dev-plus-aosp am: 61ce9b3bad am: 23e3933a73 Change-Id: I21d5820eb4b7380176ed94f02fb5a10a936007e6