Dianne Hackborn 69ff299e79 am 9b287368: am 6bdbae07: Merge "Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#..." into lmp-mr1-dev automerge: 7557ec1 ...

* commit '9b287368b05f36e322f339b82d2bb495f230ca50':
  Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#...

2014-12-10 21:59:37 +00:00

..

java

am 9b287368: am 6bdbae07: Merge "Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#..." into lmp-mr1-dev automerge: 7557ec1

2014-12-10 21:59:37 +00:00

jni

am 09378975: resolved conflicts for merge of 5196dd04 to lmp-mr1-dev-plus-aosp

2014-12-10 21:57:35 +00:00

res

Import translations. DO NOT MERGE

2014-12-10 11:35:51 -08:00

tests

Merge "Allow compilation with Jack."

2014-12-04 09:26:54 +00:00