summaryrefslogtreecommitdiff
path: root/libs/rs/rsObjectBase.cpp
diff options
context:
space:
mode:
author Jim Miller <jaggies@google.com> 2011-01-29 11:00:28 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2011-01-29 11:00:28 -0800
commita8d5dbbccdbd989e96669fdcbdb75374ed2799f4 (patch)
treee7ee5aae107a522c5295b9b5811bc2d20cdb5e27 /libs/rs/rsObjectBase.cpp
parent0044b4ad6aa59ecb95790023f9a3e45067951a22 (diff)
parent226e57563c3110aa688fc41f10b7a96cd21b6231 (diff)
am 226e5756: (-s ours) Merge "Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]" into gingerbread
* commit '226e57563c3110aa688fc41f10b7a96cd21b6231': Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]
Diffstat (limited to 'libs/rs/rsObjectBase.cpp')
0 files changed, 0 insertions, 0 deletions