tree d5923d0aa10137539f20ed1b8c2d4d7a05e4e10e
parent 3573d54d505bee9f9ffefc8ae555aeb0076eba75
parent 8fe0e5f2129d19c4a08d100ca0db10a2d38b9045
author Hung-ying Tyan <tyanh@google.com> 1500916688 +0000
committer android-build-merger <android-build-merger@google.com> 1500916688 +0000

Merge "Fix potential build break" into oc-dev am: 7740a78495  -s ours am: 1a614a0856  -s ours
am: 8fe0e5f212  -s ours

Change-Id: I2229e6d81bc20f2a81c138d7a7aa09208f0033d9