commit | a247745ddda52926c2b89b19eacdc3017546acfb | [log] [tgz] |
---|---|---|
author | Raj Mamadgi <r.mamadgi@samsung.com> | Thu Jun 28 11:32:14 2018 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jun 28 11:32:14 2018 -0700 |
tree | ca9d6ebc3fbbb23f6a95db3f0e6218d3d938d648 | |
parent | 8cc06300aa110be421360313c818bbbf15a6e822 [diff] | |
parent | d06009fddcd94fcb34a5a88bf06ed718bbe1156e [diff] |
[automerger skipped] Merge "DO NOT MERGE Fix for com.android.cts.devicepolicy.ManagedProfileTest#testCameraPolicy" into oreo-cts-dev am: af39964e18 -s ours am: b1e9682b86 am: d06009fddc Change-Id: I09292619bb26fa70af3ac9fcddae1e7b860bc5b0