commit | 373cbac7ad0b0040cf52930bf8177cfe6c343fa0 | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Tue May 17 01:11:00 2016 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue May 17 01:11:01 2016 +0000 |
tree | 164b7fa9ca8ae38b55c31ffa8728c323a05d6c45 | |
parent | c4999be6e34297f595c87cbe4c274e2bc8c1665a [diff] | |
parent | d0e6a0e3dd73ad3c20de87f4dca0b89def24935a [diff] |
Merge "Merge "Sysconfig define a whitelist of permitted backup transports" into nyc-dev am: 11d9586117 am: d4056a279d" into nyc-mr1-dev-plus-aosp