Michael Runge 647beed622 am 37fed329: Merge "Increase timeout when uncrypting OTA" into lmp-mr1-dev ...

automerge: 8deabad

* commit '8deabad541984571496456646d6a7a91eccc9e42':
  Increase timeout when uncrypting OTA

2014-12-18 01:59:10 +00:00

..

java/com/android/server

am 37fed329: Merge "Increase timeout when uncrypting OTA" into lmp-mr1-dev

2014-12-18 01:59:10 +00:00

jni

am 08ca1694: am fadfe708: Merge "CEC: Pass port ID for set_audio_return_channel" into lmp-mr1-dev

2014-12-17 21:24:50 +00:00

Android.mk

…