tree 21ad78e72a93e20838ffad441e5798c876f35100
parent cbd8479410f0e80172291ec895875866bd1b1321
parent 43e4eddd664dbc39e181a99f457394196d6c3f08
author Tao Bao <tbao@google.com> 1507653560 +0000
committer android-build-merger <android-build-merger@google.com> 1507653560 +0000

Merge changes from topic "libedify-header" am: abade5af15 am: 28e8a2c43a am: eaf3e895fe
am: 43e4eddd66

Change-Id: Ibe24c579659220f3fb39ebeeecba361b110079ed