tree 5015c1d0e39f5d41d5c6ac14ef58dc034f7c6b18
parent eacfc7749b805318f2de3f14c978f20aabf82470
parent 5c021503c67a306998d3ecac60a20d5567ebaea3
author Adam Seaton <aseaton@google.com> 1471557864 +0000
committer android-build-merger <android-build-merger@google.com> 1471557864 +0000

Merge "Update Security String to 2016-10-05 to Platform and CTS for October Security Updates (rebased)" into mnc-dev
am: 5c021503c6

Change-Id: I8f6b62b6ed8e5170b6558d7d21155f3e31665b6a