diff options
| author | Thierry Strudel <tstrudel@google.com> | 2020-09-25 06:40:33 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-25 06:40:33 +0000 |
| commit | 4160a4d0ed2182f7ed98c59203d51578278ffa33 (patch) | |
| tree | 1f4068480e2578dc5bc362d8cc376d673cd50694 /rs/java/android/renderscript/ProgramStore.java | |
| parent | d61acf3063c58e3515fe9e93c8a99b05f24bb626 (diff) | |
| parent | 87076c6b1d14f69a32c88e4a219dcb0f3734fd1e (diff) | |
[automerger skipped] Merge "BatteryStatsImpl: Add mBatteryTimeToFull to parcel" am: dee14d2d86 am: b88e1801bd am: 3605379546 am: 05eef64cc1 -s ours am: 87076c6b1d -s ours
am skip reason: Change-Id I844149d4787e3aef7808bb4f85b0f08d179c5c41 with SHA-1 3d4cba5628 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1430103
Change-Id: Ib65b2b8d46ab995bd3c8d749a05956bf53ae531a
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions