| commit | 0a4dc67f223ae336cbdf614d1de1c6c8ce84211d | [log] [tgz] |
|---|---|---|
| author | Chris Warrington <cmw@google.com> | Thu Aug 27 12:13:30 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 12:13:30 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | 534ea3b0060c5ac35205cc6237baa83d1fdb7257 [diff] | |
| parent | ed2a2fe2095af4ecb443b1ac9bc07786e2b45a13 [diff] |
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 'ed2a2fe2095af4ecb443b1ac9bc07786e2b45a13':