Merge remote-tracking branch 'common/android-4.4' into android-4.4.y

author Dmitry Shmidt <dimitrysh@google.com>

Thu, 1 Dec 2016 21:57:58 +0000 (13:57 -0800)

committer Dmitry Shmidt <dimitrysh@google.com>

Thu, 1 Dec 2016 21:57:58 +0000 (13:57 -0800)
author Dmitry Shmidt <dimitrysh@google.com>
Thu, 1 Dec 2016 21:57:58 +0000 (13:57 -0800)
committer Dmitry Shmidt <dimitrysh@google.com>
Thu, 1 Dec 2016 21:57:58 +0000 (13:57 -0800)
diff --cc kernel/time/timekeeping.c
Simple merge
diff --cc kernel/trace/trace.c
Simple merge
author	Dmitry Shmidt <dimitrysh@google.com>
	Thu, 1 Dec 2016 21:57:58 +0000 (13:57 -0800)
committer	Dmitry Shmidt <dimitrysh@google.com>
	Thu, 1 Dec 2016 21:57:58 +0000 (13:57 -0800)
		1	2
kernel/time/timekeeping.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.c	patch \|	diff1 \|	diff2 \|	blob \| history