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

automerge: 8642803

* commit '864280369ca45f9a93f4cfe9c1d020e0cbe0d7ed':
  Add put/getBoolean/Array to PersistableBundle

2014-12-10 19:17:53 +00:00

..

java

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

2014-12-10 19:17:53 +00:00

jni

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

2014-12-10 10:42:08 -08:00

res

am bf7b4d94: am f996d6b7: Merge "Added configuration to determine whether VoLTE requires provisioning." into lmp-mr1-dev

2014-12-09 20:34:55 +00:00

tests

am 05d455ca: am b9ccc047: Merge "Sanitize display names, keep extensions intact." into lmp-mr1-dev

2014-12-01 20:00:32 +00:00