Jim Miller 19847b07e8 am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev ...

* commit 'b46e48067fd03b63fa5f5191651ac2a5d009e226':
  Remove TrustAgent whitelisting API

2015-02-25 18:09:54 +00:00

..

java

am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev

2015-02-25 18:09:54 +00:00

jni

Legacy: Only set user surface dimensions on output surfaces

2015-02-11 16:58:10 -08:00

res

Import translations. DO NOT MERGE

2015-02-25 07:39:28 -08:00

tests

am feb362a5: am a0d3bfbe: am 5c9d0de1: am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation

2015-01-30 22:24:43 +00:00