diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-12-02 23:00:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-02 23:00:06 +0000 |
| commit | e580d6617f67a1db5eff7ffe5450684cfc7e1a2b (patch) | |
| tree | c55e1a0c4cc7a2c22c4bb4dfa190a2fb38f6a3df /tools/aapt2/diff/Diff.cpp | |
| parent | 47a5cb122ab495e8420c46d8f324bddcd38920af (diff) | |
| parent | e89a286541e242ad96705fcdd1fe2c6a9eafb4a0 (diff) | |
am e89a2865: Merge changes If2c7e09f,Ie21f227c
* commit 'e89a286541e242ad96705fcdd1fe2c6a9eafb4a0':
RRO idmap: pad with 0xffffffff, not 0x00000000
RRO: reintroduce lost ResTable insert of assets
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions