commit | 12a303dc37f2f02f73bcceb0838770fcb99838c3 | [log] [tgz] |
---|---|---|
author | Jeff Brown <jeffbrown@google.com> | Thu Aug 22 20:39:29 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 22 20:39:29 2013 -0700 |
tree | de6f1cc6ca623ee46f2f9cbb33dd1c7935a8e857 | |
parent | f277681ec51ce16c86a810b0ff4a42cb75e2d0f3 [diff] | |
parent | 008bfa744317aad92f1deb3de63f46767e97d45c [diff] |
am 008bfa74: (-s ours) am cfa9cd0d: am 582f50f2: (-s ours) am 9299c6cd: Ensure sample runs on Gingerbread. (DO NOT MERGE) * commit '008bfa744317aad92f1deb3de63f46767e97d45c': Ensure sample runs on Gingerbread. (DO NOT MERGE)