Selim Cinek 2fa69caeca Merge "Fix AOD styling when pulsing" into pi-dev ...

am: 8d114ef8ae

Change-Id: Ib44bb4d340dc884653b501efe2e82ee1950d1534

2018-03-23 23:54:33 +00:00

..

java

Merge "Merge "docs: fixing bug 36982027 and 30636712, typos" into oc-mr1-dev am: 5b0a4eea8d" into pi-dev

2018-03-23 23:36:28 +00:00

jni

Merge "Use ABI_STRING." am: ca7ce49ecc

2018-03-23 21:28:16 +00:00

proto

Add new key from Settings.java to settings.proto.

2018-03-23 11:15:37 +00:00

res

Merge "Fix AOD styling when pulsing" into pi-dev

2018-03-23 23:54:33 +00:00

tests

Merge "Add setting for disabling swap." into pi-dev

2018-03-23 19:47:06 +00:00