diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2016-05-27 19:26:38 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-27 19:26:38 +0000 |
| commit | 5045a20942f78aa41b8dfeea433bc352183f1b81 (patch) | |
| tree | ad9e2c4fae56d553c3396f1f1ea03dbbfd2ff874 /docs/html/sdk/api_diff/22 | |
| parent | 747037816d779f250096bf07953325a02c9a812e (diff) | |
| parent | 68f4e9fbb21d69e963bec22fd4c50721b3e400f9 (diff) | |
Merge changes from topic \'am-e4ceb878ab564c70a4e1726ee7c0709a\' into nyc-mr1-dev am: 0ce1648f01
am: 68f4e9fbb2
* commit '68f4e9fbb21d69e963bec22fd4c50721b3e400f9':
Suppress unlock notifications on non-FBE devices.
Replace caribou wallpaper without the stars b/28339724
Change-Id: I2591d99120519c1850405bafccf88312418fa31d
Diffstat (limited to 'docs/html/sdk/api_diff/22')
0 files changed, 0 insertions, 0 deletions