Draw a battery level around unlock ring [1/2]
Credits Guillaume Lesniak - Omni
Guillaume Lesniak <me@xplod.fr>
https://gerrit.omnirom.org/#/c/1819
Change-Id: I2282a65c28c8e43d4fefc66417824ba7cd68395a
Fix in MediaMuxer's JNI code

android_media_MediaMuxer_native_setup should return jlong. It was
incorrectly returning jint.

Change-Id: I31a475af0818f4d5dcbb39380b42612188cf3853
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Add Carbon QS Tile 1/2

Change-Id: I586f28704138b89f39d11081ddc718c97ce8923f
Merge "Add Carbon QS Tile 1/2" into kk
Merge "Draw a battery level around unlock ring [1/2] Credits Guillaume Lesniak - Omni Guillaume Lesniak <me@xplod.fr> https://gerrit.omnirom.org/#/c/1819 Change-Id: I2282a65c28c8e43d4fefc66417824ba7cd68395a" into kk
Merge remote-tracking branch 'upstream/kk' into kk