Jim Miller 54dbd1fd43 am 0ac8dfa3: Merge "Clarify getTrustAgentConfiguration() documentation." into lmp-mr1-dev automerge: ffd1a49 ...

* commit '0ac8dfa37bf089ade3760a8d703c6a79d98f5ca2':
  Clarify getTrustAgentConfiguration() documentation.

2015-01-22 02:45:16 +00:00

..

java

am 0ac8dfa3: Merge "Clarify getTrustAgentConfiguration() documentation." into lmp-mr1-dev automerge: ffd1a49

2015-01-22 02:45:16 +00:00

jni

am 0de2eca5: am 112e35b4: Merge "Update generationId on bitmaps when decoded into by BitmapRegionDecoder" into lmp-mr1-dev

2015-01-15 23:15:56 +00:00

res

Import translations. DO NOT MERGE

2015-01-21 08:14:22 -08:00

tests

am b5108949: am e4a031e3: Merge "New trick to install bad dex file."

2015-01-20 22:01:26 +00:00