OSDN Git Service

Merge remote-tracking branch 'origin/ub-launcher3-burnaby' into mnc-dev
authorSunny Goyal <sunnygoyal@google.com>
Thu, 10 Sep 2015 23:34:09 +0000 (16:34 -0700)
committerSunny Goyal <sunnygoyal@google.com>
Fri, 11 Sep 2015 00:22:17 +0000 (17:22 -0700)
commitea9ad5cead9ad894fb670476bb5381198cdcf2de
treefcf23a25aadc660bd2dbb8b5178da454e8a00f08
parent5845d3dbea53d513466c98b301eb49e96fe5d6a3
parent4abaf133546b0c950edc82594985e9da50d9c1dd
Merge remote-tracking branch 'origin/ub-launcher3-burnaby' into mnc-dev

Conflicts:
Android.mk

Change-Id: I05429e418a25b94e7669e002d39bc70806396b8e
Android.mk
proguard.flags