summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2018-12-05 18:30:56 -0800
committerandroid-build-merger <android-build-merger@google.com>2018-12-05 18:30:56 -0800
commit0471bcffa1bdf33d5a07fcb0088ad78f130709ac (patch)
tree787eaae95d55a768a7b7deb0d61d1481ad4f877e
parent03b1a5947c629d5fbf0c2ee766a6e28643707196 (diff)
parent8d93343bfc36571554fe9bd94608c86367772fdb (diff)
downloadthermal-0471bcffa1bdf33d5a07fcb0088ad78f130709ac.tar.gz
[automerger skipped] DO NOT MERGE am: ec43095960 -s ours am: ba907922fc -s ours
am: 8d93343bfc -s ours Change-Id: I623abf022b45a7edeb726fc33ed48fb28a8a8e32
0 files changed, 0 insertions, 0 deletions