Merge \\"Add margins to the system icons when the user avatar is gone.\\" into nyc...

author Daniel Nishi <dhnishi@google.com>

Thu, 7 Jul 2016 16:50:39 +0000 (16:50 +0000)

committer android-build-merger <android-build-merger@google.com>

Thu, 7 Jul 2016 16:50:39 +0000 (16:50 +0000)
author Daniel Nishi <dhnishi@google.com>
Thu, 7 Jul 2016 16:50:39 +0000 (16:50 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 7 Jul 2016 16:50:39 +0000 (16:50 +0000)
diff --cc packages/SystemUI/res/values/dimens.xml
Simple merge
diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
Simple merge
author	Daniel Nishi <dhnishi@google.com>
	Thu, 7 Jul 2016 16:50:39 +0000 (16:50 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 7 Jul 2016 16:50:39 +0000 (16:50 +0000)
		1	2
packages/SystemUI/res/values/dimens.xml	patch \|	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java	patch \|	diff1 \|	diff2 \|	blob \| history