Matthew Williams f7e843e3a2 Merge "AnonymousSyncService & SyncRequest."

2013-07-24 22:41:22 +00:00

..

java

Merge "AnonymousSyncService & SyncRequest."

2013-07-24 22:41:22 +00:00

jni

Rename mChannels to mChannelMask to avoid ambiguity

2013-07-24 12:20:52 -07:00

res

Merge "New permission to manage device admins"

2013-07-24 00:06:34 +00:00

tests

am b8292830: resolved conflicts for merge of a920f25f to jb-mr2-dev-plus-aosp

2013-06-28 16:53:27 -07:00