| commit | bc0cf27dcf55dbe84a207b8def3044c65e3116d1 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Thu May 12 21:04:03 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu May 12 21:04:03 2016 +0000 |
| tree | 2ba45ba8d59edb0db6395bf9e845f846fe70854b | |
| parent | 85bfe6057b04e583362842959633946a77c6ee74 [diff] | |
| parent | fbe980391e03ba1f8aa13208ebd19dcd548f3d51 [diff] |
Merge "Merge "Update Sample Device Admin" into nyc-dev am: ddb8d18cc8 am: 1e502f0b23" into nyc-mr1-dev-plus-aosp am: fbe980391e * commit 'fbe980391e03ba1f8aa13208ebd19dcd548f3d51': Change-Id: Ia58f54d53390b64216b0a75c40db5a99fcc3ed3f