| commit | 8346c52d5117197b545bba12bb862569682d49b5 | [log] [tgz] |
|---|---|---|
| author | Jin Cao <jinyan@google.com> | Thu Aug 21 04:15:58 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 21 04:15:58 2014 +0000 |
| tree | 62c102da2128117fb93b217c9bbdde8c825d8c8f | |
| parent | 11d144d8cc3c72298693f945a71f90568035457c [diff] | |
| parent | e8e460f097a39b9bd7425f50d896d166cf5a0668 [diff] |
am e8e460f0: am d36bf69b: Merge "Don\'t use textpaint for drawing icons" into ub-chips-cranbrook * commit 'e8e460f097a39b9bd7425f50d896d166cf5a0668':