OSDN Git Service

am 33210ec1: Merge "change android beam sample name" into ics-mr0
authorScott Main <smain@google.com>
Fri, 14 Oct 2011 17:31:24 +0000 (10:31 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 Oct 2011 17:31:24 +0000 (10:31 -0700)
commit655055b4af70c6a7076a6defcbf6571fd781199e
tree6af1e11c0fdf6c5b8c78257eced55a774e193e66
parent46f824a0090e8645b4e3b10b1c703981f68376d3
parent42b971076f2d4a87bc775beadb1f25fe3347aaa7
am 33210ec1: Merge "change android beam sample name" into ics-mr0

* commit '33210ec1f5c8364c4865c718f4d0de00e28b5774':
  change android beam sample name