commit | 5a53f2cb93996f60baef3dc64bf3211905c5ad00 | [log] [tgz] |
---|---|---|
author | Zach Jang <zachjang@google.com> | Mon Mar 21 17:42:55 2016 -0700 |
committer | Feng Yu <feny@google.com> | Wed Mar 23 19:20:25 2016 +0000 |
tree | d4ca43c8dd6325970b91e2ff11b3a92e8acefa0d | |
parent | bc3ca8c2713345931bb0c0253de33f5de14f3199 [diff] |
Merge Conflict--Update Security String to 2016-05-01 in preparation for May 2016 Security OTA b/27724973 Change-Id: I572123586730e45b304f352c8b0fd6371ff5788b