| commit | 6e5fdb1551ca7d117bf7e1acca133a077a8701f0 | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@android.com> | Tue Feb 11 21:41:23 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 11 21:41:23 2014 +0000 |
| tree | 192beba1ec598a2aed8e7e32de4e0dc13547134b | |
| parent | 99188064fd3b2d4ca85b02afefa4adb2562f8940 [diff] | |
| parent | 6c14f0ad82be418c742e56fe586657ea0f394b05 [diff] |
am 6c14f0ad: Merge "Runtime resource overlay, iteration 2" * commit '6c14f0ad82be418c742e56fe586657ea0f394b05': Runtime resource overlay, iteration 2