tree b22a061711ff8b8f3dccbc870d71c036800caf45
parent c027c017e2852b8da151edfab2a47eb02c7a1b54
parent 17d3fc2e6847a31116d4db9d13893e6c5a760221
author Josh Gao <jmgao@google.com> 1497933363 +0000
committer android-build-merger <android-build-merger@google.com> 1497933363 +0000

Merge "Hack around b/36066697." into oc-dev am: e139434e3a
am: 17d3fc2e68

Change-Id: I341c785941c3860344aa053670db8f4a5da18dd6