commit | 327f72b13f6e7775413ef7af5bcdae473bffe36f | [log] [tgz] |
---|---|---|
author | Adrian Roos <roosa@google.com> | Thu May 12 21:00:54 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu May 12 21:00:54 2016 +0000 |
tree | c62153178bd4304eb43694ecb784aeccad55f8d0 | |
parent | 6dc5173808628b1f62a74eb2994aff5cd9f83e9b [diff] | |
parent | 201cda71a62371a6c5a870498734de15bc1a59c6 [diff] |
Merge "Update Sample Device Admin" into nyc-dev am: ddb8d18cc8 am: 201cda71a6 * commit '201cda71a62371a6c5a870498734de15bc1a59c6': Update Sample Device Admin Change-Id: I2e275518fde4fc11d4bb9afa023e2ecca4a0c3da