commit ee5593c2869a83db48621f7481152d5000f48be8
author Android Build Merger (Role) <android-build-merger@google.com> Mon Feb 13 23:47:02 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 13 23:47:02 2017 +0000
tree 7ca66c46dbcde2c11aad1f56517d799c00563482
parent b17f4329ed24f3cace4966282dd7cec421f24c2d
parent 71a2405abddcd036e23e9e73ba3fc9f2708fe146

Merge changes from topic 'am-bdb31204347044778e7bedc5806f1310' into nyc-mr2-dev-plus-aosp

* changes:
  [DO NOT MERGE] Update Security String to 2017-04-05 on lmp-dev am: e2eff3f7ee  -s ours am: ea757ba690 am: 37aab729cf  -s ours am: 8a59a2eda2 am: 3746e17d30 am: b15a2623ac am: 4be162ac7f  -s ours am: c8b7e08b50 am: 3e0d1c32da am: 437c3dd5d3 am: 21f6e17ffd am: 839b434650
  [DO NOT MERGE] Update Security String to 2017-04-01 on lmp-dev am: ffab69998a  -s ours am: 0f30aa9801 am: 05ebddebe5  -s ours am: 101c043b17 am: 58086ff4aa am: fec9d76740 am: ea0d4b0e54  -s ours am: 45deda3682 am: 235702c0e0 am: 6063089d07 am: 85782debf1 am: da09c2fd8b