Erik Kline 0f3c0704c5 am 180a30aa: am 95b5ca90: am 9261d9d6: Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev ...

* commit '180a30aa57e0790453944533dc442704f7596f65':
  Remove CONNECTIVITY_CHANGE_DELAY and friends.

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

..

java

am 180a30aa: am 95b5ca90: am 9261d9d6: Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev

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

jni

resolved conflicts for merge of a75b0ad3 to master

2014-12-04 13:51:41 -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