John Reck 3bae94d78e resolved conflicts for merge of fe11126d to lmp-mr1-dev-plus-aosp ...

Change-Id: I60bf82ff71d9af0d80e7da8856efb4641c85885b

2014-12-09 15:38:38 -08:00

..

java

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

2014-12-09 15:38:38 -08:00

jni

Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." into lmp-mr1-dev automerge: 3ef5033

2014-12-09 23:20:39 +00: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