Dongwon Kang 27c7a7d06b Merge "TIF: Define more cannonical genres in TvContract" into lmp-mr1-dev automerge: f6df7bf ...

automerge: d048789

* commit 'd048789aeaf64779a7062faa3bd806c69652857a':
  TIF: Define more cannonical genres in TvContract

2014-10-24 03:24:49 +00:00

..

java/android

Merge "TIF: Define more cannonical genres in TvContract" into lmp-mr1-dev

2014-10-24 02:24:18 +00:00

jni

MtpDatabase: Increase size of string buffer in JNI code

2014-10-03 17:54:18 +00:00

lib

…

mca

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

2014-10-02 14:32:37 +01:00

tests

am 694fd58d: am fed9888e: Merge "Remove outdated tests for custom decoder." into lmp-mr1-dev

2014-10-22 22:39:30 +00:00