Jason Monk b22d1002d1 am 730409c3: am 013d14f8: Merge "Make lock task check if focused better" into lmp-mr1-dev ...

* commit '730409c332e19c34f7c309fbe054532eec88bdbc':
  Make lock task check if focused better

2014-10-24 15:20:55 +00:00

..

java/com/android/server

am 730409c3: am 013d14f8: Merge "Make lock task check if focused better" into lmp-mr1-dev

2014-10-24 15:20:55 +00:00

jni

Merge "TIF: fix wrong config comparison & confusing method name" into lmp-mr1-dev automerge: cfc7323

2014-10-24 02:08:06 +00:00

Android.mk

…