tree 3398b6ab18d40d187c47824202ce4ca263ff0c5c
parent 019f4385d17234324db23521149e1f1cb6d7d061
parent 1f19690322523d5a28051c55353735513638ca39
author Scott Main <smain@google.com> 1375478860 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1375478860 -0700

am 1f196903: Merge "add note to use "480" instead of "xxhdpi" (this should be temporary)" into jb-mr2-docs

* commit '1f19690322523d5a28051c55353735513638ca39':
  add note to use "480" instead of "xxhdpi" (this should be temporary)