tree af8500a155ab76d5d7ad3afa47035304beac159e
parent 21d6f1f70a7920e25352da60351864f824218b55
parent 70b5353274a72109b7cb8b259f40075f073f35a0
author Tianjie Xu <xunchang@google.com> 1462213652 +0000
committer android-build-merger <android-build-merger@google.com> 1462213652 +0000

resolve merge conflicts of 23c7af7 to nyc-mr1-dev-plus-aosp
am: 70b5353274

* commit '70b5353274a72109b7cb8b259f40075f073f35a0':
  Add ability to show "installing security update"

Change-Id: I6d6a5e0bdaedb7c02ff81a7761b03d7781e71ced