Eino-Ville Talvala e50e596e50 am cfdc0762: am 3e3ae5b7: am 0aaf843c: Merge "Fix docs build" into lmp-mr1-dev ...

* commit 'cfdc0762e22ec82fa6f6d98abf1d14d5f54ab633':
  Fix docs build

2014-12-09 00:19:15 +00:00

..

java

am cfdc0762: am 3e3ae5b7: am 0aaf843c: Merge "Fix docs build" into lmp-mr1-dev

2014-12-09 00:19:15 +00:00

jni

resolved conflicts for merge of 203c8171 to master

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

res

am 8d50d0fb: am 23ad6efb: am df1d07b4: Add checking to find AppDirectedSmsProxy for App Directed SMS feature

2014-12-09 00:19:03 +00:00

tests

Merge "Allow compilation with Jack."

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