tree a22747a3bf083ec38c840dff034d79730b27b4ab
parent b5f84ef1c3bb029c0c1ec0984479a7477d5cf549
parent a2015e0d86a7255105c446d5e37e3762e9668fa6
author Tao Bao <tbao@google.com> 1490728894 +0000
committer android-build-merger <android-build-merger@google.com> 1490728894 +0000

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

Change-Id: I55bd4c762033cbfd68b019c3fad861ff9b954450