am 0cd670b3: am a0b3796d: Merge "Doc change: Add diffs for API level 21." into lmp-dev

* commit '0cd670b39be13e1840927694b36d6c61e5c7c1dd':
  Doc change: Add diffs for API level 21.