diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2016-05-27 03:13:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-05-27 03:13:47 +0000 |
| commit | 0ce1648f016e96cd7a496753b86d16f78795930a (patch) | |
| tree | 8be0cf6d883680b1090617023024afd1795b4136 /rs/java/android/renderscript/ProgramStore.java | |
| parent | b5cb2ff00a119870875b8f0aa2e9fd0fa49f1890 (diff) | |
| parent | e9baebb2689500b52677168f602e296b40318d86 (diff) | |
Merge changes from topic 'am-e4ceb878ab564c70a4e1726ee7c0709a' into nyc-mr1-dev
* changes:
Merge "Suppress unlock notifications on non-FBE devices." into nyc-dev am: a39d888651
Merge "Replace caribou wallpaper without the stars b/28339724" into nyc-dev am: b3d4ad2205
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions