tree fe67a59efa0ed65fbfdce79a4d9bb59267fad6ff
parent a4f3fa62a36a0bcb0dfc3adae54bb802084cd690
parent dd447382cd2a1fb81b5d6607d25fed2c76fcd9e5
author John Reck <jreck@google.com> 1452537195 +0000
committer android-build-merger <android-build-merger@google.com> 1452537195 +0000

am cc8418fc: am 1641c0cb: Merge "Move AssetAtlas off of SkBitmap*" into mnc-dev
am: dd447382cd

* commit 'dd447382cd2a1fb81b5d6607d25fed2c76fcd9e5':