| commit | fbe980391e03ba1f8aa13208ebd19dcd548f3d51 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Thu May 12 21:01:05 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu May 12 21:01:06 2016 +0000 |
| tree | c62153178bd4304eb43694ecb784aeccad55f8d0 | |
| parent | 327f72b13f6e7775413ef7af5bcdae473bffe36f [diff] | |
| parent | 8f51262f89de93fb600830ae133c3f64279f5d28 [diff] |
Merge "Merge "Update Sample Device Admin" into nyc-dev am: ddb8d18cc8 am: 1e502f0b23" into nyc-mr1-dev-plus-aosp