tree 340ddfc44dbc132105a02f3c1208ccd257b6bf4b
parent f3b4f3fc7995378208783de786c96698fc77a5ca
parent d0c9619f711eecb9e5b79ed43d4c9e20c9297483
author Kenny Root <kroot@google.com> 1296170200 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296170200 -0800

am d0c9619f: (-s ours) am 99e7b894: Add in cache values for non-xlarge screens DO NOT MERGE

* commit 'd0c9619f711eecb9e5b79ed43d4c9e20c9297483':
  Add in cache values for non-xlarge screens DO NOT MERGE