| commit | a95f7d775b3ca6d1ca110f697956578f9f1b7fad | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Wed May 25 00:18:59 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 25 00:18:59 2016 +0000 |
| tree | c0ef7318d93b5121d82b9db0a2ff834243018210 | |
| parent | e818ac4abf759bc7c60d7548404ac6b8ac5a7c33 [diff] | |
| parent | 0db3ad24100e21d1a6bd2e6fb6cf1cdd67d02e47 [diff] |
Merge "resolve merge conflicts of f950ec9 to nyc-dev" into nyc-dev am: 0db3ad2410 * commit '0db3ad24100e21d1a6bd2e6fb6cf1cdd67d02e47': Fix missing permission check when saving pattern/password Change-Id: Iec05d3688aa270cfa6fa8ead54fd1a933591786d