Etan Cohen f428db20d0 am 16918817: Merge "Added configuration to determine whether VoLTE requires provisioning." into lmp-mr1-dev ...

automerge: b4eb723

* commit 'b4eb72322fb26b08c781f051651ec5106725c80f':
  Added configuration to determine whether VoLTE requires provisioning.

2015-01-11 19:21:34 +00:00

..

java

am 2b46774f: Merge "Guard against MountService throwing NPE." into lmp-mr1-dev

2015-01-09 19:24:31 +00:00

jni

resolve merge conflicts of 0f647c1 to lmp-mr1-dev-plus-aosp.

2015-01-09 17:19:45 -08:00

res

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

2015-01-11 19:21:34 +00:00

tests

am 93241de7: Merge "Remove a bitrotted test."

2014-12-18 02:40:10 +00:00