tree e69fd0a6821e3be5f1e1e7576bc74d525c61d243
parent 0cb8868739d7f2f0b73078d9c3a5f1987c1a6312
parent 773d377754b8f79a3da7c7ef715199314d785460
author Trevor Johns <trevorjohns@google.com> 1430074523 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430074523 +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)