OSDN Git Service

Merge "Back-port ag/2491664" into nyc-dev
authorPhil Weaver <pweaver@google.com>
Tue, 18 Jul 2017 21:23:17 +0000 (21:23 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 18 Jul 2017 21:23:17 +0000 (21:23 +0000)
commit3adf585961a03f26aed9c654ec899396341ae0f5
treeaad97357bf05cefd50aad2e1eb834c7f13fdaf09
parentaf26bae8b3527e92b8930d3277353ba10841cb29
parentb1685ab0578568f4a2d58cddec8fcb9bed815b86
Merge "Back-port ag/2491664" into nyc-dev