tree 7dc880dc4e85171ba68864ac4c83bf0127d8264e
parent 214c136d02b3c591de2b35f5ae49820b7e4b7e05
parent 78bba113cb0279d76f2d9a9ffc6525147da958f5
author Tina Zhou <tinazh@google.com> 1476726278 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1476726278 +0000

Merge "Let package of encryption be set by resolving information" into nougat-cts-dev