tree d178d7e58d30dd6a33dd3d8e1fab6493a4a5279b
parent e7d76993811ffd7f6bab233ea95bb775e6fb689f
parent b18f65a1686be187e9a250d5d47b593fe589475a
author Selim Cinek <cinek@google.com> 1496931329 +0000
committer android-build-merger <android-build-merger@google.com> 1496931329 +0000

Merge "Fixed a bug where the navigation notification would flicker" into oc-dev
am: b18f65a168

Change-Id: I385374ede44f09bb729ec7df7be13dc62c19bb2a