OSDN Git Service

Merge "Back-port fixes for b/62196835" into nyc-dev am: 0b0834fbe8 am: 4fa8b51c0c...
authorPhil Weaver <pweaver@google.com>
Tue, 18 Jul 2017 22:41:23 +0000 (22:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Jul 2017 22:41:23 +0000 (22:41 +0000)
commit727f27e6611bcfc2cccd53de4efcad705c53ff30
tree04edfa2109adac8ba6b9cfa8826d6901c2d15959
parent1ccec78121bb7dd50b907fa0c02701f608600e04
parent40f47253fdf224366f56a29875a0e8cfe9292962
Merge "Back-port fixes for b/62196835" into nyc-dev am: 0b0834fbe8 am: 4fa8b51c0c  -s ours am: 2a93c3d390 am: fef2328f35 am: 713a5420dd am: 80c2eeedbb
am: 40f47253fd

Change-Id: I8031af47f1d2a55a0ea2fd73cd782ca80ecd6cea