tree a22747a3bf083ec38c840dff034d79730b27b4ab
parent c1966bd6b9609ed14b91dd96e00d20e222595ccf
parent e003a97668c4bcf4e2382ad38bf6c3e42d4ca131
author Tao Bao <tbao@google.com> 1490729494 +0000
committer android-build-merger <android-build-merger@google.com> 1490729494 +0000

Merge changes from topic 'sinkfn' am: 34df98ee6d am: 862b7e8523 am: a2015e0d86
am: e003a97668

Change-Id: I04d941f9df9b83df53e8f564e4abcd83d61c279a