Paul Lawrence 876c00dcf5 am 60302f19: am c220d8e5: Stop crypto UI from crashing during encryption automerge: 0e6178b automerge: e20dd30 automerge: 31deee5 ...

* commit '60302f1938e684407458e61b082353bf770c5dac':
  Stop crypto UI from crashing during encryption

2014-10-25 02:35:44 +00:00

..

java/com/android/server

am 60302f19: am c220d8e5: Stop crypto UI from crashing during encryption automerge: 0e6178b automerge: e20dd30 automerge: 31deee5

2014-10-25 02:35:44 +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

…