tree 1d46fb110cb6d1a0d4ea2ffea3b8eaac32975c7d
parent fddf38b15e4eaf5faab95413300f53fc2a5c717d
parent 9800e8730621f31cc6bd4880fae7191b0c7b3d6f
author Tao Bao <tbao@google.com> 1507652885 +0000
committer android-build-merger <android-build-merger@google.com> 1507652885 +0000

Merge "Update the path to error_code.h." am: 4aab2f3500
am: 9800e87306

Change-Id: I1cdaf9f2bf9f68b40fa4d47259ea05ce79378c61