George Mount 7291d7b2c5 Merge "Fix javadoc." into lmp-mr1-dev automerge: 8b26674 ...

automerge: dd185b6

* commit 'dd185b657dba19e913e0e01a8213756fdd8e4cfc':
  Fix javadoc.

2014-11-05 18:03:51 +00:00

..

java

Merge "Fix javadoc." into lmp-mr1-dev automerge: 8b26674

2014-11-05 18:03:51 +00:00

jni

am e6fa3f44: am d1f1ea76: Merge "Few more small meminfo improvements." into lmp-mr1-dev

2014-11-04 02:21:11 +00:00

res

Merge "Zen: Create a new exit condition for "next alarm"." into lmp-mr1-dev automerge: 0bdefb9

2014-11-05 15:42:30 +00:00

tests

am befe778c: Treat optimistic addresses as global preferred.

2014-10-30 19:10:04 +00:00