diff options
author | Amith Yamasani <yamasani@google.com> | 2010-07-01 13:53:08 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-01 13:53:08 -0700 |
commit | 2cc2c75dccc08ecbffb44a47463df9a139e2786e (patch) | |
tree | ce713a0bc96022d8e6c23f83e56602d60e55aa29 /graphics/java/android/renderscript/RenderScript.java | |
parent | eba857d126e2b76a368f41d3169a56fe28029674 (diff) | |
parent | c7dacb7374e04c003b0764e7c348765b629c18cb (diff) |
am c7dacb73: Merge "DO NOT MERGE: Add a battery capacity value to the power profile." into gingerbread
Merge commit 'c7dacb7374e04c003b0764e7c348765b629c18cb' into gingerbread-plus-aosp
* commit 'c7dacb7374e04c003b0764e7c348765b629c18cb':
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