Alan Viverette bf7ef37898 am 0e8aabd6: am 662039c6: Merge "Update IME selection dialog layout for Material" into lmp-mr1-dev ...

* commit '0e8aabd6c9dfef168a6de714219fc52ecaca08ea':
  Update IME selection dialog layout for Material

2014-11-25 18:44:42 +00:00

..

java/com/android/server

am 0e8aabd6: am 662039c6: Merge "Update IME selection dialog layout for Material" into lmp-mr1-dev

2014-11-25 18:44:42 +00:00

jni

resolved conflicts for merge of 5e6cf242 to lmp-mr1-dev-plus-aosp

2014-11-12 13:24:42 -08:00

Android.mk

…