OSDN Git Service

Separate ambient display triggers am: b7e4e10618
authorAdrian Roos <roosa@google.com>
Tue, 18 Oct 2016 22:19:43 +0000 (22:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Oct 2016 22:19:43 +0000 (22:19 +0000)
am: 59116440e7

Change-Id: I588f5541c73ae356b255ffa6b1e23c1fbcd1693e

1  2 
core/res/res/values/config.xml
core/res/res/values/symbols.xml

Simple merge
Simple merge