Merge "Allow shell to acquire wakelock. DO NOT MERGE." into nyc-mr1-dev

am: 30a0f96250

Change-Id: I9b65c17d58907c861956bec0bc8f9f91ad8890af
This commit is contained in:
Wei Liu
2016-10-06 20:58:04 +00:00
committed by android-build-merger

Diff Content Not Available