tree a917dd3d7eeb25c00acdb7d96a417dd2c13a0288
parent 52569ce2eda536219a901ba24bab6c935394db5b
parent 862b7e8523800e638eb1230680c30ebad2f6e5c8
author Tao Bao <tbao@google.com> 1490728594 +0000
committer android-build-merger <android-build-merger@google.com> 1490728594 +0000

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

Change-Id: I859296b62fcd7b43775885f4d2ece3272a9bff11