Marco Nelissen 633f8c227b am 28f032e6: am e2c046fe: am 13249411: am a9045d24: am 337aa376: Merge "Add NULL check in updateProxyConfig" ...

* commit '28f032e6a66d74d570b36672939000707455acb1':
  Add NULL check in updateProxyConfig

2014-01-14 16:25:18 +00:00

..

java/android

Merge "Prepare for additional formats beyond 8-bit and 16-bit PCM"

2014-01-13 19:25:58 +00:00

jni

am 28f032e6: am e2c046fe: am 13249411: am a9045d24: am 337aa376: Merge "Add NULL check in updateProxyConfig"

2014-01-14 16:25:18 +00:00

lib

resolved conflicts for merge of e0b14ea7 to master

2013-12-13 15:59:51 -08:00

mca

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

tests

Camera2: add metadata override

2013-10-07 08:02:25 -07:00