| commit | fe11126d23f7456b4ea1dffce30dac45173f63f0 | [log] [tgz] |
|---|---|---|
| author | John Reck <jreck@google.com> | Tue Dec 09 23:18:08 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 09 23:18:08 2014 +0000 |
| tree | 96563e386a90bebceb1c2064ec6b2ecf851222cc | |
| parent | 6d9826546d89e03cea170ebb5b3f292d5f4a027b [diff] | |
| parent | 4f1942d999c60fd91cb826651b6d978d47a74321 [diff] |
am 4f1942d9: Merge "Teach AssetAtlas about more drawables" into lmp-mr1-dev * commit '4f1942d999c60fd91cb826651b6d978d47a74321': Teach AssetAtlas about more drawables