tree 6a9024b8899b3ea2d1eee5b25fd0c524d32b3844
parent 3713a1ae5befd207d60da92ce3d81dec6efbab9a
parent 0450be7d8981d8bacad17c1a521be2231136c7de
author Heidi von Markham <hvm@google.com> 1433960127 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433960127 +0000

am 0450be7d: am 25fd4e7a: Merge "Clarify notification requirements per device type" into lmp-mr1-dev

* commit '0450be7d8981d8bacad17c1a521be2231136c7de':
  Clarify notification requirements per device type