tree 93e2034b23b5e7da13b4237efb59de355f5ccccd
parent 7591bf5fe6858c4ba435a84ae490cdd8ac04f799
parent b996a186f142a2544ff48ef95479e261319c9ef3
author Deepanshu Gupta <deepanshu@google.com> 1404916955 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404916955 +0000

am b996a186: (-s ours) am 9f595d98: am 6077f5f2: am 2e9dc1fe: am 4b84593f: (-s ours) am b0470a1f: am d7ce8452: am 10e54073: (-s ours) am ca82da92: am 5d0db7f2: am 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev

* commit 'b996a186f142a2544ff48ef95479e261319c9ef3':
  Add a script to rename fonts for SDK. [DO NOT MERGE]