diff options
author | Steve Elliott <steell@google.com> | 2020-06-02 18:53:32 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-02 18:53:32 +0000 |
commit | ad14c752c4306f6dffda66ec105a429d65341e93 (patch) | |
tree | 4a25a98825b815bc6e5eb0269dc87e2790b70c44 /rs/java/android/renderscript/ScriptIntrinsicHistogram.java | |
parent | cfe4b3458be6a0d51d83279c1238a2224fde8493 (diff) | |
parent | 4c42f40c1f47dbbce7a016cd1ca4d3b7e3694ea9 (diff) |
Merge "Always use Shortcut Icon in conversation if available" into rvc-dev am: cc1937581a am: 4c42f40c1f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11662920
Change-Id: Ifcdbc8f129e1f7463e98a190e0dc1d66b95980e4
Diffstat (limited to 'rs/java/android/renderscript/ScriptIntrinsicHistogram.java')
0 files changed, 0 insertions, 0 deletions