Winson Chung bffce8ce7a resolved conflicts for cf426036 to stage-aosp-master ...

Change-Id: If1bd5860a2f7392df7f7d6fdb13cdc315d8fcc8c

2015-10-14 16:24:28 -07:00

..

attrs.xml

resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

2015-07-22 13:06:28 -07:00

colors.xml

Fixing widgets container inactive scroll bar color.

2015-08-24 15:24:17 -07:00

config.xml

Revert "Adding viewId for the QSB"

2015-08-27 15:32:05 -07:00

dimens.xml

Adding graphic for all apps empty search screen.

2015-08-28 12:34:55 -07:00

strings.xml

resolved conflicts for cf426036 to stage-aosp-master

2015-10-14 16:24:28 -07:00

styles.xml

resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

2015-07-22 13:06:28 -07:00