Jeff Sharkey 432f755d44 am ac0f9ffd: am da07fe64: am eeb36c5c: am d88d8174: Merge "Null pointer exception in FileRotator.java" ...

* commit 'ac0f9ffda2a7e48d2d641654dafd11b8da39830a':
  Null pointer exception in FileRotator.java

2014-03-17 17:57:13 +00:00

..

java

am ac0f9ffd: am da07fe64: am eeb36c5c: am d88d8174: Merge "Null pointer exception in FileRotator.java"

2014-03-17 17:57:13 +00:00

jni

am 2fd045c0: DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516

2014-03-17 15:55:46 +00:00

res

Merge "Temporarily allow system apps to fully act across users."

2014-03-17 17:17:36 +00:00

tests

am ac0f9ffd: am da07fe64: am eeb36c5c: am d88d8174: Merge "Null pointer exception in FileRotator.java"

2014-03-17 17:57:13 +00:00