Merge changes from topic 'am-d80037280d644891882d5e01cf30f607' into nyc-mr2-dev-plus-aosp
* changes: [DO NOT MERGE] Updating Security String to 2017-04-05 on klp-dev am:502366cdc4
am:3ce29b8a94
am:b0cef41b76
-s ours am:8f86884a97
-s ours am:c901cec8b2
am:a150db6547
-s ours am:28ecd6fdd5
am:58300f46bf
am:764c206e6d
am:533ca31c93
-s ours am:4a18b463ab
am:1cfaef4241
am:4fae3e67ef
am:3ce06ee405
am:1e00b70b51
[DO NOT MERGE] Update Security String to 2017-04-01 on klp-dev am:00c627eb31
am:5be6d3bbb4
am:ed38784898
-s ours am:84702d9919
-s ours am:d466175346
am:bc19d8140c
-s ours am:53a64664c9
am:caff84dcbe
am:2f222829e0
am:69586d29d7
-s ours am:8f510b8ca1
am:34f2511b65
am:8bc2b6dc86
am:e62cac071f
am:6762121356
This commit is contained in:
committed by
Android (Google) Code Review
commit
14e2bd586d