commit | 268b04e16052d5ef76954b6688f9d35b23509d83 | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Fri May 27 03:52:49 2016 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Fri May 27 03:52:50 2016 +0000 |
tree | 537039285ea48e5946e7fb5eb5658d824048986b | |
parent | 04e20d380565b7d108422d5b15a14916703b6248 [diff] | |
parent | 1ed6a87655a72b38b809d88862406d1876899e5e [diff] |
Merge changes from topic 'am-e885a22f20324bb0b94c97a807186535' into nyc-mr1-dev-plus-aosp * changes: Merge "Suppress unlock notifications on non-FBE devices." into nyc-dev am: a39d888651 am: 3f9059fb8d Merge "Replace caribou wallpaper without the stars b/28339724" into nyc-dev am: b3d4ad2205 am: 7eb7b41510