tree 34e6d82f5727345ceecbb5b3ea7a8a1efd8577f6
parent 29668f02dc89abccfd29477413d838a9fd4f273e
parent 7d5746309b5c41a708cdb4d5dba201a5d24e3dd1
author Zhomart Mukhamejanov <zhomart@google.com> 1527832016 -0700
committer android-build-merger <android-build-merger@google.com> 1527832016 -0700

Merge "updater_sample: Add @GuardedBy" am: 2759733136 am: a37a085a11
am: 7d5746309b

Change-Id: I89adebc0d563a0b4a543a5321476ecd661d7d21f