| commit | 97fb2690c493bab4e874f0a12f28acff494a3b91 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Wed May 25 00:17:09 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 25 00:17:09 2016 +0000 |
| tree | d65951bf13ed8f613a24ce95cf2705e7e0143d8c | |
| parent | 505425c0631585a943de164a051bb6a83fd1ffec [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: I76b097259a3bd072536b69476da7ef36b3b73de4