commit | f2fefc0c83911d9b0cc27310631c7ab459405149 | [log] [tgz] |
---|---|---|
author | Siyamed Sinir <siyamed@google.com> | Sat Sep 30 04:04:15 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Sat Sep 30 04:04:15 2017 +0000 |
tree | c842b99461e952f3e0757a5b10fba7119010324e | |
parent | b98920058e607e81048ec986c9014877ca29ebbe [diff] | |
parent | 887bfae40b51c31b1467abc765ea522fbe48bb13 [diff] |
Merge "Fix ClipboardService device lock check for cross profile am: 6d79675e0c am: 095eda9307 am: a4f6ca3e77 am: 85439e9114 am: 17735f183a am: d93f91a137 am: 9865205a4e am: 7c7945c959 am: 36153a9689 -s ours am: 9b3559aee9 am: eee38701b5 am: 055acca2ed" into oc-mr1-dev-plus-aosp am: 887bfae40b Change-Id: I28be043599f0510eaa5ad1c3d8c518a70902da41