| commit | 8720a9e281926fe2c333256821b7c37bdd3ca767 | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Fri Jul 09 17:05:20 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 09 17:05:20 2010 -0700 |
| tree | 1b568f3aa2e25f189496191e0a94b3f8caf81473 | |
| parent | b522da92ffc7258b7ce61aa4afb5079ed1483069 [diff] | |
| parent | 3a92d3482964216a9cdab501e2e3deb86f81440a [diff] |
am 3a92d348: am 1aa32188: Add new native-plasma sample code. Merge commit '3a92d3482964216a9cdab501e2e3deb86f81440a' * commit '3a92d3482964216a9cdab501e2e3deb86f81440a': Add new native-plasma sample code.