tree 65096aa7334dde60da2ebd2f52231e1fa83fc110
parent 47b51140ac7fb7193d52169c3db7088204bc3f6d
parent 49013426969c13071ac1ba31be7913e1219f56b9
author Pengquan Meng <mpq@google.com> 1504750084 +0000
committer android-build-merger <android-build-merger@google.com> 1504750084 +0000

Merge "Remove unused code" am: fad0863829
am: 4901342696

Change-Id: Ib5478645aa61706b6542196ada9797ad6ff10402