OSDN Git Service

Merge "Allow goldfish-setup to take wake locks" am: 10f6bf093d
authorLingfeng Yang <lfy@google.com>
Fri, 6 Jan 2017 20:07:19 +0000 (20:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 6 Jan 2017 20:07:19 +0000 (20:07 +0000)
commitf0069a0c7fd811c684dc1bbc2c27796916e80b1e
tree92ed07ba65f47fe4b4d6de1c02c696d4cc668379
parent9937a72425a2d069b13dacf7fedb056ac1e35e79
parent528a561d4e295e4f5ece737af7d6edeaedc736b7
Merge "Allow goldfish-setup to take wake locks" am: 10f6bf093d
am: 528a561d4e

Change-Id: I94dc950a2401967c1688290762fea8df0fab96ed