OSDN Git Service

Merge "Hack around b/36066697." into oc-dev am: e139434e3a
authorJosh Gao <jmgao@google.com>
Tue, 20 Jun 2017 04:36:03 +0000 (04:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Jun 2017 04:36:03 +0000 (04:36 +0000)
commit5966301234fd72da05e20003b5bf81b450fe8965
treeb22a061711ff8b8f3dccbc870d71c036800caf45
parentc027c017e2852b8da151edfab2a47eb02c7a1b54
parent17d3fc2e6847a31116d4db9d13893e6c5a760221
Merge "Hack around b/36066697." into oc-dev am: e139434e3a
am: 17d3fc2e68

Change-Id: I341c785941c3860344aa053670db8f4a5da18dd6