tree e3d74543179d80068fb13512f00b33c842a22794
parent 7b488099443b839c0dd72bb7bc411b352847dbd3
parent 773d377754b8f79a3da7c7ef715199314d785460
author Trevor Johns <trevorjohns@google.com> 1429830309 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429830309 +0000

am 773d3777: (-s ours) DO NOT MERGE: Update version for Android samples pkg (lmp-mr1)

* commit '773d377754b8f79a3da7c7ef715199314d785460':
  DO NOT MERGE: Update version for Android samples pkg (lmp-mr1)