tree 7ca907cc359e61587e4de585d65e4e2dc0a4dd41
parent 811f94b197db11db00eb73cb41abcd7365a61a8d
parent 1dbcf1a1595ce4e50ac28d5886562081637a8be0
author Android Build Merger (Role) <android-build-merger@google.com> 1461339967 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1461339969 +0000

Merge "Merge "Fixed a bug where notifications could overlap" into nyc-dev am: 33e2fc481c am: 53405ffa62" into nyc-mr1-dev-plus-aosp