tree 2b7e71ff8cba33f426522a064465993e5e8c763b
parent 67c67a7fe724f12408dcd82e71c4ce6187508a0e
parent 74b28c0ac99bb8835e986dced70113aa055d1fa4
author Hung-ying Tyan <tyanh@google.com> 1500917349 +0000
committer android-build-merger <android-build-merger@google.com> 1500917349 +0000

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

Change-Id: Ic315138b27cd508b12c0c9aa8a3196c262b308a0