Philip P. Moltmann c48311f0eb Merge "We only have one mock service." into nyc-dev ...

am: c05a7a0

* commit 'c05a7a04c22c836c49ea0e605247c0f35799a3dc':
  We only have one mock service.

Change-Id: I6c3748cb83103be7a50cff528d97607e73de7ef0

2016-04-05 23:25:14 +00:00

..

java

Merge "API feedback: clarify onQuotaExceeded() documentation" into nyc-dev

2016-04-05 23:24:59 +00:00

jni

Merge "App upload to Context hub." into nyc-dev

2016-04-05 01:37:49 +00:00

res

Merge "Split ACTION_MANAGED_PROFILE_AVAILABILITY_CHANGED into two." into nyc-dev

2016-04-05 14:56:44 +00:00

tests

Merge "We only have one mock service." into nyc-dev

2016-04-05 23:25:14 +00:00