tree fcf23a25aadc660bd2dbb8b5178da454e8a00f08
parent 5845d3dbea53d513466c98b301eb49e96fe5d6a3
parent 4abaf133546b0c950edc82594985e9da50d9c1dd
author Sunny Goyal <sunnygoyal@google.com> 1441928049 -0700
committer Sunny Goyal <sunnygoyal@google.com> 1441930937 -0700

Merge remote-tracking branch 'origin/ub-launcher3-burnaby' into mnc-dev

Conflicts:
	Android.mk

Change-Id: I05429e418a25b94e7669e002d39bc70806396b8e