tree d44fa9da1aea4aafb4d544d66426426539371e3e
parent 0a33c02df42639269f346be0ee3dc59af095a0e3
parent 1f19e829301352a0de997a70f521bca2c4ea03a5
author Tao Bao <tbao@google.com> 1475600769 +0000
committer android-build-merger <android-build-merger@google.com> 1475600769 +0000

Merge "edify: Move the testcases to gtest." am: 0bc2df1696 am: 6fbed10fa5 am: bace857dbb
am: 1f19e82930

Change-Id: Iced6882f71a74d3e65045f8ced73edb58493555d