tree 0e91def30bd3a5666da2c8352f0773893d90635e
parent 21326822f702decf6f51f31eb38553483f6b4b5f
parent 50e72439648dc36205ad307a07f3050270346308
author Trevor Johns <trevorjohns@google.com> 1261007542 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1261007542 -0800

am 50e72439: am 5ff60dff: Updating frameworks/base/docs/html/shareables/latest_samples.zip to reflect current state of sample code as of 1d151678.

Merge commit '50e72439648dc36205ad307a07f3050270346308'

* commit '50e72439648dc36205ad307a07f3050270346308':
  Updating frameworks/base/docs/html/shareables/latest_samples.zip to reflect current state of sample code as of 1d151678.