summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2018-12-10 10:06:11 -0800
committerandroid-build-merger <android-build-merger@google.com>2018-12-10 10:06:11 -0800
commit139e96da08f9445ee264e0ecf6e04b679365aaf9 (patch)
tree2d57e9e87d4df17237a91eca2b6b97fe6f7ca0c0
parentc6b93442fa3e69b7991049835aa5051e7336d5b3 (diff)
parentb208421e1541768c135e12ff42f53d2d901b1311 (diff)
downloadpower-139e96da08f9445ee264e0ecf6e04b679365aaf9.tar.gz
[automerger skipped] Merge "DO NOT MERGE"
am: b208421e15 -s ours Change-Id: I2df13bc448dfb360cc4ec428bcd5b4ec0410885a
0 files changed, 0 insertions, 0 deletions