commit | 3ac0e4b3a515cf7f426500e2619332aa37ce4eb1 | [log] [tgz] |
---|---|---|
author | Adam Seaton <aseaton@google.com> | Fri May 19 19:46:52 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri May 19 19:46:52 2017 +0000 |
tree | 57bfb75347027b7e07496984e1d72b8dfa9a59f9 | |
parent | 7035d675810b3617ebe2d5aa0b0fc9d00bf27772 [diff] | |
parent | 10c50a7ad6d80f331412bef652a0f9fd1dd3400f [diff] |
Merge "[DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev bug:38342695" into lmp-dev am: 18fc68549b -s ours am: 0a97d3f909 am: ddac9519eb -s ours am: 7ad3c1407c am: 16dcd532a0 am: 535ade48f8 am: 3f5593376d -s ours am: 288fd15d69 am: 701dc24fb9 am: 75864440c3 am: 0987d99c90 am: 0edfdf927d -s ours am: f283419a6c am: 10c50a7ad6 Change-Id: Id10bdcbda2e1b83882732a3a2d913fb80ed3c78e