Jeff Sharkey 236dc2c81d am 1102e712: Merge "Throw IOException when missing default ringtone." into lmp-mr1-dev ...

automerge: 8650c35

* commit '8650c358fb44b943dd74751742333bf1cebf7b8e':
  Throw IOException when missing default ringtone.

2014-12-09 23:59:58 +00:00

..

java/android

Merge "Throw IOException when missing default ringtone." into lmp-mr1-dev

2014-12-09 23:34:07 +00: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

lib

…

mca

Merge "Add -Wno-unused-parameter to LOCAL_CFLAGS"

2014-12-04 01:04:09 +00:00

tests

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

2014-11-21 09:57:52 -08:00