diff options
author | Jeff Brown <jeffbrown@google.com> | 2014-05-06 20:30:49 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-06 20:30:49 +0000 |
commit | a93369a819c9d4cfd4fe7ce3dd519f1c974bce4d (patch) | |
tree | 53cde5487397c666ab5fa634bcbadce41f923f8f /rs/java/android/renderscript/RenderScript.java | |
parent | c41fa708271e204a7983aba291389ea1554227b2 (diff) | |
parent | 84aaf124b762b9eeb0957aaea9df8424a429b148 (diff) |
am 84aaf124: Merge "Plumb display state and interactive information to BatteryStats. (DO NOT MERGE)" into klp-modular-dev
* commit '84aaf124b762b9eeb0957aaea9df8424a429b148':
Plumb display state and interactive information to BatteryStats. (DO NOT MERGE)
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions