| commit | d25ed735e2b6ee6b88ee2ba5ceb894f021402d5c | [log] [tgz] |
|---|---|---|
| author | Chris Warrington <cmw@google.com> | Thu Aug 27 21:35:56 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:35:56 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | d70427cdec60d22f7bd6bb1851c88197a04f70d8 [diff] | |
| parent | 0a4dc67f223ae336cbdf614d1de1c6c8ce84211d [diff] |
am 0a4dc67f: am ed2a2fe2: (-s ours) am d77d8a12: am b8535429: Merge "Add translatable="false" to generated resvalues." into studio-1.4-dev automerge: d0065dc automerge: f1f5dcd * commit '0a4dc67f223ae336cbdf614d1de1c6c8ce84211d':