tree db6f56c0dfa3cc2ad4064962f35ba407863281a2
parent d11b4bdd21c706fc52ceb57efdbc6764e130a7c9
parent 7740a78495c3c676278a07fd32e7e74a8b543da4
author Hung-ying Tyan <tyanh@google.com> 1500916057 +0000
committer android-build-merger <android-build-merger@google.com> 1500916057 +0000

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

Change-Id: I700e85d2f6c504e92e9120f492147b85ff6389a6