OSDN Git Service

[automerger skipped] Merge "DO NOT MERGE Log encryption key size" into pi-dev
authorJack He <siyuanh@google.com>
Wed, 27 Mar 2019 10:29:31 +0000 (03:29 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 27 Mar 2019 10:29:31 +0000 (03:29 -0700)
commita360163739de84c3c425cbcdafd45b982e81e4b6
tree3e3f1129ff94dbf4153603ca096272b76b0fe39c
parent3e3aa5eb040a5cc8b03c50c734b2ac6e05686f63
parent9515d91c6f4433bbe91e52668721a0fd539a3261
[automerger skipped] Merge "DO NOT MERGE Log encryption key size" into pi-dev
am: 9515d91c6f -s ours
am skip reason: SHA1 9515d91c6f skipped by user siyuanh

Change-Id: I1a316d221cef64768e1a2ed1a5cb4b50cf3b78a5