OSDN Git Service

Merge "Change 2nd and later burn-in protection intervals to 2 mins" into cw-f-dev
authorErik Wolsheimer <ewol@google.com>
Wed, 12 Oct 2016 05:13:00 +0000 (05:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 12 Oct 2016 05:13:00 +0000 (05:13 +0000)
commitc806566082b7d958a3783e6e526f943b9daa1497
tree1cd912a776f99ebc3c4e654e02eae1d03e73ec7a
parent5b9d419965a681535f28c3c4b3ab0638b8ad81ba
parent56746f9830eb2e91692c2f0882dbd3ab8438b213
Merge "Change 2nd and later burn-in protection intervals to 2 mins" into cw-f-dev
am: 56746f9830

Change-Id: I89b58af12ee5940ad3f4cbb93f9777eeb641df86