tree da422e4b520e1220af63fe45948bd473d1c13412
parent 442498681d19a26def2bccc198fbaec6783e163a
parent 86c9894f04a64f8a84c811e68b2542dd8f097dc5
author Michal Karpinski <mkarpinski@google.com> 1465839613 +0000
committer android-build-merger <android-build-merger@google.com> 1465839613 +0000

Merge \"Remove \'You can choose to either trust or remove this certificate\' from Check certificate dialog\" into nyc-dev
am: 86c9894f04

Change-Id: I7d2252a50b54c765e2c2a9837ca181861a7bae35