Jeff Sharkey 3a58678ac2 am 7a531be1: am 94758633: am b5da7b23: Merge "Throw when taking non-existant Uri permission." into klp-dev ...

* commit '7a531be13bc9ba6218747c185cd199c9e864c60f':
  Throw when taking non-existant Uri permission.

2013-10-14 11:54:21 -07:00

..

common_time

…

input

am b2db2fbc: am 6d90862f: am d65825ab: Merge "Private flags are masked in correct variable" into klp-dev

2013-10-03 16:43:17 -07:00

java

am 7a531be1: am 94758633: am b5da7b23: Merge "Throw when taking non-existant Uri permission." into klp-dev

2013-10-14 11:54:21 -07:00

jni

Private flags are masked in correct variable

2013-10-02 16:18:55 -07:00

tests/servicestests

resolved conflicts for merge of 94b51810 to master

2013-10-14 10:39:41 -07:00