commit | fe7f1cda1896e3f6235cc635fb3fac13215ad0e6 | [log] [tgz] |
---|---|---|
author | Siyuan Zhou <siyuanzhou@google.com> | Thu Mar 15 11:43:54 2018 -0700 |
committer | Siyuan Zhou <siyuanzhou@google.com> | Thu Mar 15 11:46:29 2018 -0700 |
tree | e10326f235dffe1b7a38e293c96be70fc1f55a63 | |
parent | d5f156e7af964d18a1f10bbc54852531fe8b7ad0 [diff] | |
parent | e30e3bea7a788d8c61ff005b1551cfd9f53f6c28 [diff] |
Merge branch 'android-msm-bullhead-3.10-security-next' into android-msm-bullhead-3.10 May 2018.1 Bug: 74404153 Signed-off-by: Siyuan Zhou <siyuanzhou@google.com> Change-Id: I98e7e3bb405048e971437d2487fa90f332609523