OSDN Git Service

Merge "Back-port ag/2491664" into nyc-dev
authorPhil Weaver <pweaver@google.com>
Tue, 18 Jul 2017 21:44:43 +0000 (21:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Jul 2017 21:44:43 +0000 (21:44 +0000)
commit6fee9a5e9193d1236597c74f2a729de21895f15e
tree57330f8d37f8f3b9322145d9a817b5db85d890c6
parenta1426f209c2d9a5c867f378dfa9baaa7d21661a5
parent3adf585961a03f26aed9c654ec899396341ae0f5
Merge "Back-port ag/2491664" into nyc-dev
am: 3adf585961  -s ours

Change-Id: I8ba7e805110028752e1968e38ac548fcd4194438