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

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