tree baf327c6902e8aacae95646d5a8388bc713602c5
parent 2d0c6f769d2b341654d6f8c701d29c6ff839f5a5
parent df0817df7c0a37cb9c5ad4ef0591472675d4e075
author Bill Yi <byi@google.com> 1491252196 -0700
committer Bill Yi <byi@google.com> 1491252196 -0700

Merge remote-tracking branch 'goog/security-aosp-mnc-mr1-release' into HEAD