[DO NOT MERGE] Use tokens instead of account access trackers am: 32bfb594af

author Svet Ganov <svetoslavganov@google.com>

Tue, 27 Sep 2016 20:59:00 +0000 (20:59 +0000)

committer android-build-merger <android-build-merger@google.com>

Tue, 27 Sep 2016 20:59:00 +0000 (20:59 +0000)
author Svet Ganov <svetoslavganov@google.com>
Tue, 27 Sep 2016 20:59:00 +0000 (20:59 +0000)
committer android-build-merger <android-build-merger@google.com>
Tue, 27 Sep 2016 20:59:00 +0000 (20:59 +0000)
diff --cc Android.mk
Simple merge
diff --cc core/java/android/accounts/AccountManager.java
Simple merge
author	Svet Ganov <svetoslavganov@google.com>
	Tue, 27 Sep 2016 20:59:00 +0000 (20:59 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 27 Sep 2016 20:59:00 +0000 (20:59 +0000)
		1	2
Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/accounts/AccountManager.java	patch \|	diff1 \|	diff2 \|	blob \| history