diff options
author | Adam Lesinski <adamlesinski@google.com> | 2016-06-10 02:21:54 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-10 02:21:54 +0000 |
commit | d499d79b07a7f15df15d843242563e4282ecdd83 (patch) | |
tree | 8d8460719eada2328465f935c0519b66a37ab4f5 /rs/java/android/renderscript/RenderScript.java | |
parent | 69a983dfec7140ee6aad5e2ffddc55fe3c5f170d (diff) | |
parent | 094c40b2cc70fefb29771fb90d7ea7437905b3a5 (diff) |
Merge \"BatteryStats: Record fine grained battery discharge\" into nyc-dev
am: 094c40b2cc
Change-Id: Ie85fcfc2fa7aec5e7c15f57d605840c563c0e993
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions