Craig Mautner d2a4320875 am 647130ba: am 7a17e0b6: Merge "Add put/getBoolean/Array to PersistableBundle" into lmp-mr1-dev automerge: 8642803 ...

* commit '647130baacf4f0caf077b5bf6ce00c5e1a23107b':
  Add put/getBoolean/Array to PersistableBundle

2014-12-10 21:59:23 +00:00

..

java

am 647130ba: am 7a17e0b6: Merge "Add put/getBoolean/Array to PersistableBundle" into lmp-mr1-dev automerge: 8642803

2014-12-10 21:59:23 +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