Amith Yamasani 7ed3951b9b am 50207f04: am 3e732ab2: am e1970346: am b5afeca3: am a865bb5d: Merge "Use the correct method to check if device is encrypted" into lmp-dev ...

* commit '50207f043f8fd2e39173956c9b4ee52fe775e115':
  Use the correct method to check if device is encrypted

2014-10-17 21:28:28 +00:00

..

java

am 50207f04: am 3e732ab2: am e1970346: am b5afeca3: am a865bb5d: Merge "Use the correct method to check if device is encrypted" into lmp-dev

2014-10-17 21:28:28 +00:00

jni

Merge "Fix build breakage in HWUI JNI"

2014-10-16 13:15:16 +00:00

res

Merge "Update AM/PM selectors for clock face TimePicker" into lmp-mr1-dev automerge: 0db6536 automerge: e0fceba

2014-10-17 00:51:15 +00:00

tests

am 8a3785ca: am fd2d41b7: Merge "Replacing FloatMath native implementation with calls to Math"

2014-10-16 09:35:43 +00:00