tree a917dd3d7eeb25c00acdb7d96a417dd2c13a0288
parent d4d9ef3941b074d1adb21b98b330991d40fc4cca
parent 34df98ee6dfaec9b95c2f5d3e6f64c0daacc1958
author Tao Bao <tbao@google.com> 1490728271 +0000
committer android-build-merger <android-build-merger@google.com> 1490728271 +0000

Merge changes from topic 'sinkfn'
am: 34df98ee6d

Change-Id: I05710606fac5b4b8746416799635691f4083aef4