tree e3d74543179d80068fb13512f00b33c842a22794
parent acee4e84ecda5656e598d3a3b174504f99175b16
parent c474affc8f7ca9ac371095527be46d91ddb6f016
author Trevor Johns <trevorjohns@google.com> 1430079791 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430079791 +0000

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

* commit 'c474affc8f7ca9ac371095527be46d91ddb6f016':