John Reck 1022888d33 resolved conflicts for merge of 203c8171 to master ...

Change-Id: I256397410c261fae049bae4572f132235be1c5c9

2014-12-04 16:06:34 -08:00

..

java

resolved conflicts for merge of 203c8171 to master

2014-12-04 16:06:34 -08:00

jni

resolved conflicts for merge of 203c8171 to master

2014-12-04 16:06:34 -08:00

res

am 7c614473: am 36ccf75b: am fb754252: UICC : discard language setting of SIM

2014-12-04 21:55:24 +00:00

tests

Merge "Allow compilation with Jack."

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