tree 18083606bdd5fb26959b2d4dfd6bb01fe3b68458
parent b53d8c6062ccf265260df582198e4396df5fd9dd
parent 28e8a2c43a749f4e124aa363e0529f4e5d454683
author Tao Bao <tbao@google.com> 1507652889 +0000
committer android-build-merger <android-build-merger@google.com> 1507652889 +0000

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

Change-Id: I0492beacef5c544beb2e3fa0ce0fe25070a0348a