commit | 12704f3e2796157c6d8a03692ae5bdbc2db2ea38 | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Wed Jul 19 22:47:33 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jul 19 22:47:33 2017 +0000 |
tree | 31ce5037cea4812b2dfcf37498f5b1ec27f135d6 | |
parent | 3b49e3e16bf7fc8ab8ee3cf0d13c33d6b3f62164 [diff] | |
parent | e6b2cb887fc2e9bbecb9c1cf4c3fa78339a78cfc [diff] |
Merge "Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into lmp-dev am: 788d85f5ae -s ours am: c0d2cfb8b8 am: 214aeaefef -s ours am: 451a9d73bf am: d3789031c9 am: 35f0f8df33 am: f01d7163e8 -s ours am: aec34cff65 am: 8f46ad2ded am: 29c817a61c am: dbecffb85f am: c7040501a1 -s ours am: 6ac9ecd397 am: 05eed82d81" into oc-dr1-dev-plus-aosp