| commit | 2215c396a087ed0e402998868f485c8d998487f8 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Wed Feb 24 02:02:50 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Feb 24 02:02:50 2016 +0000 |
| tree | 7cf5aef50212c3a19b92a72e253f1afdf7062bcd | |
| parent | da00ecbb55db978f8064878bbb1197911be3a5a0 [diff] | |
| parent | e27adc8911b9bb9464cc3167c0479243eef2d4a9 [diff] |
Merge "resolve merge conflicts of 0d092ccad9 to marshmallow-cts-dev" into marshmallow-cts-dev am: e27adc8911 * commit 'e27adc8911b9bb9464cc3167c0479243eef2d4a9': Add a host-side test to verify run-as works in adb shell.