diff options
| author | Amith Yamasani <yamasani@google.com> | 2010-07-01 13:55:26 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-01 13:55:26 -0700 |
| commit | 69fc43d495695cfc59e5015eea91fb750a088f02 (patch) | |
| tree | a5644706ca380ddad80bbbe8e85a8bc937ceb544 /graphics/java/android/renderscript/RenderScript.java | |
| parent | 85e39f64e8ccfc31d5290e91fe2fa5ff5df273f6 (diff) | |
| parent | 2cc2c75dccc08ecbffb44a47463df9a139e2786e (diff) | |
am 2cc2c75d: (-s ours) am c7dacb73: Merge "DO NOT MERGE: Add a battery capacity value to the power profile." into gingerbread
Merge commit '2cc2c75dccc08ecbffb44a47463df9a139e2786e'
* commit '2cc2c75dccc08ecbffb44a47463df9a139e2786e':
DO NOT MERGE: Add a battery capacity value to the power profile.
Diffstat (limited to 'graphics/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions