OSDN Git Service

am e89a2865: Merge changes If2c7e09f,Ie21f227c
authorAdam Lesinski <adamlesinski@google.com>
Tue, 2 Dec 2014 23:00:06 +0000 (23:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 2 Dec 2014 23:00:06 +0000 (23:00 +0000)
commite580d6617f67a1db5eff7ffe5450684cfc7e1a2b
treec55e1a0c4cc7a2c22c4bb4dfa190a2fb38f6a3df
parent47a5cb122ab495e8420c46d8f324bddcd38920af
parente89a286541e242ad96705fcdd1fe2c6a9eafb4a0
am e89a2865: Merge changes If2c7e09f,Ie21f227c

* commit 'e89a286541e242ad96705fcdd1fe2c6a9eafb4a0':
  RRO idmap: pad with 0xffffffff, not 0x00000000
  RRO: reintroduce lost ResTable insert of assets