ref: 67c866750cf27298cfa363bc594df729b6c57fd1
parent: 9c98fb2bab6125a0614576bf7635981163b1cc79
parent: 7c4992c4667f4f3392b911e3a8b17a776a216c5f
author: Yunqing Wang <yunqingwang@google.com>
date: Mon Oct 20 04:26:46 EDT 2014
Merge "Remove the dependency in token storing locations"