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