| commit | 5fabfe1786c6f4ca62840c667bf1126dc319940d | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Wed Jun 18 01:54:50 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 18 01:54:50 2014 +0000 |
| tree | ee847e7017192bf2f6b03ae0835b490e2e206758 | |
| parent | c5e962866b4aaeba414a93a6868aadbff7d239d9 [diff] | |
| parent | 40c2c69bd8a6fda34a3ed7d78cf53b092b0ffa67 [diff] |
am 40c2c69b: (-s ours) resolved conflicts for merge of c91c719f to klp-modular-dev-plus-aosp * commit '40c2c69bd8a6fda34a3ed7d78cf53b092b0ffa67': Package renamed fonts. [DO NOT MERGE]