| commit | 7d3e02fbf1da34d9bd84c4f776f22b4b5462b158 | [log] [tgz] |
|---|---|---|
| author | David Ng <dave@codeaurora.org> | Wed Dec 09 19:01:39 2015 -0800 |
| committer | David Ng <dave@codeaurora.org> | Wed Dec 09 19:01:39 2015 -0800 |
| tree | 6f5cc49958abade0083f95bd067c18b169504ed5 | |
| parent | 2f36e6de97d1e9b6e21538edfdddab28aa14ad31 [diff] | |
| parent | 1f76969bd8b6179f256dafb938bb458bc997c23d [diff] |
Merge tag 'android-6.0.1_r3' into 601r3 Android 6.0.1 release 3 * tag 'android-6.0.1_r3': Limit maximum number of concurrent keystore operations. Fix failure to save master key on new profile Change-Id: Iec52f582e6e5f05adcc93004d2a53f9afe583ffc