Jorim Jaggi d9b91d0d49 resolved conflicts for merge of 803a6dc0 to lmp-mr1-ub-dev ...

Change-Id: I194616c947a3366911e932f4c7111097d3767db3

2014-11-26 15:17:14 +01:00

..

android

am 0a310c99: Merge "Revert "Animates AbsSeekBar progress movement from key presses."" into lmp-mr1-dev

2014-11-26 00:56:47 +00:00

com

Make IKeyguardService interface asynchronous

2014-11-25 23:22:52 +01:00

jarjar-rules.txt

…

overview.html

…