| commit | 1e5223977e004653a171b1e541e2928fdf66cc8e | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Thu Sep 18 20:56:41 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 18 20:56:41 2014 +0000 |
| tree | 3d4707615f7ddc1bfbc5efe0eecefdc5c60cfb86 | |
| parent | bc65b5cbdf7288338200660b7e9cd20f78d83f97 [diff] | |
| parent | d176068a45c8a534701e49026c865110b18d6ad1 [diff] |
am 85e4d515: am 9d301c82: Merge "Lock in final resource IDs." into lmp-dev * commit '85e4d515a7610207cde07521c05d12297117d6cf': Lock in final resource IDs.