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:26:36 +0000 (22:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Jul 2017 22:26:36 +0000 (22:26 +0000)
commit80c2eeedbb14a7b146461df2aae394d473027764
tree6641e346ffdbbc892dcb3e952b83eff3e7fdeeef
parent442fc85852f45725dabf55050fb64b50ff158051
parent713a5420dd544539c43905e96bbd87b9a7e061c3
Merge "Back-port fixes for b/62196835" into nyc-dev am: 0b0834fbe8 am: 4fa8b51c0c  -s ours am: 2a93c3d390 am: fef2328f35
am: 713a5420dd

Change-Id: Ib3e9b5d8c8807a5e7f41f94d127008fc4f255f3e