Chris Craik 06e7fe5a70 resolve merge conflicts of f2235b6 to master. ...

Change-Id: Ibcef3a37ca0749931d509b53bd52e53a7d30ddbb

2014-11-20 17:27:36 -08:00

..

java

resolve merge conflicts of f2235b6 to master.

2014-11-20 17:27:36 -08:00

jni

am 3a091b79: resolved conflicts for merge of 8e0cfe7c to lmp-mr1-dev-plus-aosp

2014-11-20 23:47:07 +00:00

res

am c51fdd1b: am bf1960ce: Merge "Fade notifications when exiting dozing" into lmp-mr1-dev automerge: 6456513

2014-11-20 21:34:40 +00:00

tests

am 648f8106: am db3d76ab: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into lmp-mr1-dev

2014-11-13 00:40:28 +00:00