tree 501e788bb0e745a190839f93b3735f70d561d389
parent a79c09493e2589d2ca6030a6042a2a566c641833
parent 45de34c58c6e733de609964378bfea13e02cd005
author Tao Bao <tbao@google.com> 1507134467 +0000
committer android-build-merger <android-build-merger@google.com> 1507134467 +0000

Merge "edify: Remove edify_parser." am: 281d4eefb1 am: dfbe70b79d am: 159db1dd49
am: 45de34c58c

Change-Id: Ib7bc3e33b26f7bbda996ed500847e1cebbf592d7