OSDN Git Service

Merge "Merge "add vold to "shutdown critical"" am: da85cb71b3 am: 228b95fa15 am:...
authorKeun-young Park <keunyoung@google.com>
Thu, 6 Jul 2017 01:39:27 +0000 (01:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Jul 2017 01:39:27 +0000 (01:39 +0000)
am: f39281b68c

Change-Id: If9b0ee31633ae73ad9257ee6035bdb1bd3c3d861


Trivial merge