tree 880d32b7e460441b178db4bc5ddd0b74f383477d
parent 0dd72dc2dac5ee57fd597f172e5015650312a700
parent c6c1f3d81bdfd8a9b8bbc56cc63ff7275e2fe291
author Ben Murdoch <benm@google.com> 1415915788 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1415915789 +0000

Merge "Add support for SmartClip interface in the glue layer." into m39