tree d01cf0d5bb529ba0d27a93e06f9c46f144882829
parent 71c92b356099c90d52a848981855be3fef5c895f
parent f8584042713aad82f9d057ecaace8a9ad1aad0bc
author Mark Ashdown <ashdown@google.com> 1389960916 +0000
committer Mark Ashdown <ashdown@google.com> 1389961072 +0000

Merge remote-tracking branch 'goog/jb-ub-now-kermit' into kermit-release

Conflicts:
	src/com/android/launcher3/LauncherClings.java

Change-Id: Idd2e6d54180315854216cfc868cd36297dcb95d9