Patrick Tjin edefe7e094 am 6b4a1c6c: am e3703050: Add recovery kmsg to dropbox automerge: 6aa6733 ...

* commit '6b4a1c6c46e3f1d3506341aa27e10c5dcc190add':
  Add recovery kmsg to dropbox

2014-12-10 21:58:12 +00:00

..

java

am 6b4a1c6c: am e3703050: Add recovery kmsg to dropbox automerge: 6aa6733

2014-12-10 21:58:12 +00:00

jni

am 09378975: resolved conflicts for merge of 5196dd04 to lmp-mr1-dev-plus-aosp

2014-12-10 21:57:35 +00:00

res

Import translations. DO NOT MERGE

2014-12-10 11:35:51 -08:00

tests

Merge "Allow compilation with Jack."

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