OSDN Git Service

Merge changes from topic 'am-e4ceb878ab564c70a4e1726ee7c0709a' into nyc-mr1-dev
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Fri, 27 May 2016 03:13:44 +0000 (03:13 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 27 May 2016 03:13:47 +0000 (03:13 +0000)
* 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


Trivial merge