Philip P. Moltmann b8ccfaa4ff Merge "Expose additional fields needed by PrintRecommendationService GTS test and move files into properly named directory." into nyc-dev ...

am: a1a1aa3

* commit 'a1a1aa3c682215f0ac7251c43f77985b9aced2a2':
  Expose additional fields needed by PrintRecommendationService GTS test and move files into properly named directory.

Change-Id: I6a177370c3fdcf0d81eedc3bc383f389f058b06a

2016-04-20 15:06:47 +00:00

..

java

Merge "Expose additional fields needed by PrintRecommendationService GTS test and move files into properly named directory." into nyc-dev

2016-04-20 15:06:47 +00:00

jni

Merge "Force windows to be scalable during pinned animation." into nyc-dev

2016-04-19 22:17:16 +00:00

res

Import translations. DO NOT MERGE

2016-04-18 22:03:13 -07:00

tests

Merge "Record in progress count when parceling Timer" into nyc-dev

2016-04-20 01:31:46 +00:00