commit | 2ac3120a0161f85daa7a267a4e373373340afb12 | [log] [tgz] |
---|---|---|
author | Dmitry Shmidt <dimitrysh@google.com> | Thu Feb 01 00:29:23 2018 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Feb 01 00:29:23 2018 +0000 |
tree | 4abd10b0d80456268852ac935dd11518aaffb229 | |
parent | b9af110c03ba6b2f2033a8c747d878083ee3a26b [diff] | |
parent | f6d960ac31214343309807d1d00bdcc05c9ce31b [diff] |
Merge "Fix dev settings crash when no OEM unlock service" am: 44cacaa8f1 am: f6d960ac31 Change-Id: I536daa3948be136524e35e35448df09eaa6ad9da