tree 60eae5629b1efdc68ea10a54a19364623a2b6652
parent 60686586a5f9c8f78b9ad16e19782da85e89a760
parent 934b04d3767974934d3d2e90e6196955f5b83d0c
author Dianne Hackborn <hackbod@google.com> 1418343591 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418343591 +0000

am 934b04d3: (-s ours) am 27fad66a: Merge "DO NOT MERGE.  Bump version to 5.0.2." into lmp-dev

* commit '934b04d3767974934d3d2e90e6196955f5b83d0c':
  DO NOT MERGE.  Bump version to 5.0.2.