commit | 0a55e45c5749367b8c88d004b3d118bc57a39d5c | [log] [tgz] |
---|---|---|
author | Patrick Tjin <pattjin@google.com> | Wed Oct 12 15:14:38 2016 -0700 |
committer | Patrick Tjin <pattjin@google.com> | Wed Oct 12 15:14:38 2016 -0700 |
tree | 4ecb7fc703ba0a7ffe6a98585d64698387e3a052 | |
parent | 9236e1d0b9c407aa02fcbbac10267690f66ad56a [diff] | |
parent | 3c865718ebf0543a9e19331dceba7c1a2ee6782e [diff] |
Merge branch 'android-msm-marlin-3.18-ndr-factoryrom-security-next' into android-msm-marlin-3.18-ndr-factoryrom November 2016.1