| commit | 4ad93639d210297764db3ffcd870ff38464943de | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@android.com> | Tue Feb 11 13:34:46 2014 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 11 13:34:46 2014 -0800 |
| tree | ba794933d10f7716326b59672dc96775dae310c3 | |
| parent | 0cd115e1cebf4c090e7c36a65d4a5b7d1c363c21 [diff] | |
| parent | 67754d93c4bfb2da1831b1dd2b40c12a838b1028 [diff] |
am 67754d93: Merge "Runtime resource overlay, iteration 2" * commit '67754d93c4bfb2da1831b1dd2b40c12a838b1028': Runtime resource overlay, iteration 2