OSDN Git Service

[automerger skipped] Merge "DO NOT MERGE Fix bug when pressing the add user cancel...
authorAarthi Balachander <aarthibc@google.com>
Thu, 24 May 2018 02:18:14 +0000 (19:18 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 24 May 2018 02:18:14 +0000 (19:18 -0700)
am: c433cccd84  -s ours

Change-Id: I1dc70b48e0307b993e406115975689b75f66fc92


Trivial merge