commit | 8f51262f89de93fb600830ae133c3f64279f5d28 | [log] [tgz] |
---|---|---|
author | Adrian Roos <roosa@google.com> | Thu May 12 21:00:53 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu May 12 21:00:53 2016 +0000 |
tree | c62153178bd4304eb43694ecb784aeccad55f8d0 | |
parent | 6dc5173808628b1f62a74eb2994aff5cd9f83e9b [diff] | |
parent | 1e502f0b23634f462c63619068dc5bcfa1728cfd [diff] |
Merge "Update Sample Device Admin" into nyc-dev am: ddb8d18cc8 am: 1e502f0b23 * commit '1e502f0b23634f462c63619068dc5bcfa1728cfd': Update Sample Device Admin Change-Id: I7b359f607da152a55a4b9a0db5e1994979e2d64a