tree c882d91ee8763622ff0d3149092973b92d570587
parent 2f2c0e75af6c1a52e067903d0cf9aa4cddd4e37e
parent 5ef8d14d38654e6309babf46f64f5a296df5c169
author Scott Main <smain@google.com> 1392931667 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392931667 +0000

am 5ef8d14d: am 72eff55b: am d43ad2f3: am 4c68c4ed: am 24a8e1d0: am af87e19b: Merge "update intent examples for maps bug: 12661490 bug: 12957723" into klp-docs

* commit '5ef8d14d38654e6309babf46f64f5a296df5c169':
  update intent examples for maps bug: 12661490 bug: 12957723