tree d5923d0aa10137539f20ed1b8c2d4d7a05e4e10e
parent 74b28c0ac99bb8835e986dced70113aa055d1fa4
parent a44a523506eb9ee59f8ad0c30fe30522ceda5196
author Hung-ying Tyan <tyanh@google.com> 1500916709 +0000
committer android-build-merger <android-build-merger@google.com> 1500916709 +0000

Merge "Merge "Fix potential build break" into oc-dev am: 7740a78495  -s ours am: bb4c42ccb7  -s ours" into oc-dr1-dev-plus-aosp
am: a44a523506  -s ours

Change-Id: I397fe4b62f72141e2b08b27891fb512bf5bd79d5