am f3a6b901: am 9df48a03: Merge "NotificationManager: droiddoc documentation improvements"

* commit 'f3a6b901917b1609c6f1901bb36deb07a58fd20d':
  NotificationManager: droiddoc documentation improvements