commit | 84dd33d8e54bf175fe4045999202cc92ef6fb948 | [log] [tgz] |
---|---|---|
author | Chris Tate <ctate@android.com> | Thu May 26 00:34:16 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu May 26 00:34:16 2016 +0000 |
tree | a3ed1e61a9e2082066642b79d890735713ef1350 | |
parent | 347d660ce25e72835aefc794b584c07d32ae5264 [diff] | |
parent | 36a1b38e899687b217fe6e043022ed83fc37386b [diff] |
Merge "Merge "Backport of backup transport whitelist" into mnc-dev am: 2cfc6baa22 am: 600d4f61ca am: c69aa838a8 am: 38a37f336f -s ours" into nyc-dev am: 36a1b38e89 * commit '36a1b38e899687b217fe6e043022ed83fc37386b': Backport of backup transport whitelist Change-Id: Iaac686d1ac503ab9799a1de1d10f8bb874d8199a