tree 35a30ec2093ef93052ec8991905756d39b7de212
parent 87f09a9ed649768ae73ddf06a0191fd9d27cfc7b
parent 0e1287eba0f01dd0cf6e8777a084ea8689e5245b
author Xavier Ducrohet <xav@android.com> 1297115130 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1297115130 -0800

am 0e1287eb: (-s ours) am b82c8fad: (-s ours) am 1cedfdb0: Update samples API level. DO NOT MERGE

* commit '0e1287eba0f01dd0cf6e8777a084ea8689e5245b':
  Update samples API level. DO NOT MERGE