Add Amami lunch combo
Change-Id: Ib0856d5eafd9592262d4c719211f3133ebf3dee1
Signed-off-by: Omar Einea <eineao@gmail.com>
Duh, small bump for jenkins restart

Change-Id: I9c9d449d7244524efbee28dba918eb76efc84b23
Signed-off-by: Josue Rivera <prbassplayer@gmail.com>
Add custom density for amami

Change-Id: I681f43fba456667d4898d20e118904d5dae82705
Bump for weekly 7.4

Change-Id: I6bc3d5625bad38c1f871a10607438dc74a3ecd72
Signed-off-by: Josue Rivera <prbassplayer@gmail.com>
Merge branch 'upstream/kk4.4'

Conflicts:
	config/common.mk