tree 786867109b3ccf761ed03d4a059f10f778846fa9
parent 08b81a84e149ec844ace07beb153c97a616fac56
parent e57df508c4523f67a8f6ae9d1e4f3337423cacfa
author Suren Baghdasaryan <surenb@google.com> 1550168389 -0800
committer android-build-merger <android-build-merger@google.com> 1550168389 -0800

Merge "Add cgroups.recovery.json into recovery image"
am: e57df508c4

Change-Id: I9a9e4ea7cfc22af97facbd359f2e2a72ec55a19f