RoboErik b59eacf5fe resolved conflicts for merge of a41f48f8 to master ...

Change-Id: Ida37d1eacf32a391cd1963e31f8fd76d97e9869a

2014-09-05 14:29:31 -07:00

..

current.txt

resolved conflicts for merge of a41f48f8 to master

2014-09-05 14:29:31 -07:00

removed.txt

Addressing API council comments for UserManager.

2014-09-05 10:07:02 -07:00