| commit | 2ac6b296a72965583d5f7aba3edcdc38f2c71cce | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Wed Sep 26 11:50:18 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 26 11:50:18 2012 -0700 |
| tree | 0bb88fc8047a86202874dab25dbe38c02cfc9135 | |
| parent | 72ce2c17634339d2c3dc5d97cd59b2d76eed4c50 [diff] | |
| parent | 7d4f070e18eadae0c056f6929dbf524a1aea1b84 [diff] |
am 7d4f070e: (-s ours) am a2b978bc: Merge "Fix writing text version of styleable IDs. do not merge." into jb-mr1-dev * commit '7d4f070e18eadae0c056f6929dbf524a1aea1b84': Fix writing text version of styleable IDs. do not merge.