Pavel Zhamaitsiak 0cec63a283 am 913c9895: am d89f0d3d: am b81ce34a: Merge "Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"" into lmp-mr1-dev ...

* commit '913c9895466c6749aa1c41b875d69d5de3e3b66b':
  Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"

2014-12-09 00:18:39 +00:00

..

java

am 913c9895: am d89f0d3d: am b81ce34a: Merge "Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"" into lmp-mr1-dev

2014-12-09 00:18:39 +00:00

jni

resolved conflicts for merge of 203c8171 to master

2014-12-04 16:06:34 -08:00

res

am 673f443f: am 695b5d25: am 0752da22: Merge "add system|signature protection to android.permission.BIND_CARRIER_MESSAGING_SERVICE" into lmp-mr1-dev

2014-12-09 00:18:12 +00:00

tests

Merge "Allow compilation with Jack."

2014-12-04 09:26:54 +00:00