commit fc1d64f1705acf6928dace66f4bac33e1da3f354
author Android Build Merger (Role) <android-build-merger@google.com> Tue Jan 17 23:29:33 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 17 23:29:34 2017 +0000
tree 2971fb25b62f98fb35be9661cc51e01ced60ebaf
parent 59745d99a62d02fcf8003084e2bffcc2f7830710
parent b7f6f4b9124bf1ed92d3f9ae209c1014e4c6aab0

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

* changes:
  [DO NOT MERGE] Updating Security String to 2017-03-05 on mnc-dev am: b6ac653f2d am: 41f489b098 am: cc7fef92de am: bc83db626c  -s ours am: 96ec99b33a am: 7b5b22f71e am: f2da174999 am: 543c171c07 am: d64b7a3366
  [DO NOT MERGE] Updating Security String to 2017-03-01 on mnc-dev am: a0cf89a0a0 am: b3048c5407 am: 039d96139b am: a37d310d61  -s ours am: efe40b59c9 am: 0bda876342 am: 9a6c74e74d am: f3804904a0 am: f5d39d139a