kmccormick 24b8947f62 resolved conflicts for merge of 603f987f to jb-mr2-dev ...

Change-Id: I4a130dad9d4669799f5d477f67e0f9a6a04381ca

2013-03-27 19:23:51 -07:00

..

java

resolved conflicts for merge of 603f987f to jb-mr2-dev

2013-03-27 19:23:51 -07:00

jni

Disable some noisy error logs.

2013-03-27 12:34:30 -07:00

res

Merge "Reenable optional permissions parsing and expose APIs" into jb-mr2-dev

2013-03-28 00:13:45 +00:00

tests

Merge "Make isHostRoute match only host routes" into jb-mr2-dev

2013-03-27 21:59:10 +00:00