OSDN Git Service

am 6e5fdb15: am 6c14f0ad: Merge "Runtime resource overlay, iteration 2"
authorDianne Hackborn <hackbod@android.com>
Tue, 11 Feb 2014 21:49:02 +0000 (21:49 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 11 Feb 2014 21:49:02 +0000 (21:49 +0000)
commit297097957f5023b73b2c5c369d0c02cbebd20fa5
tree5cf68ddb6a161d35d610d65f5a653a0302ba7d03
parent667c3a19d8bb4877c0d5d84807b991e62a91f3ed
parent6e5fdb1551ca7d117bf7e1acca133a077a8701f0
am 6e5fdb15: am 6c14f0ad: Merge "Runtime resource overlay, iteration 2"

* commit '6e5fdb1551ca7d117bf7e1acca133a077a8701f0':
  Runtime resource overlay, iteration 2