| commit | 3fa48a2063ab6af2fbf972d793edefefea0ca3be | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Thu Feb 20 21:58:02 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 20 21:58:02 2014 +0000 |
| tree | 2eb5335924f63c5264fa2775ced50f68b9715299 | |
| parent | f9bf991cb57e8835a2dcffb35853b4d77ac7b2c4 [diff] | |
| parent | fb7b3181fc291b17f4376d1163edd32c4fb8cca7 [diff] |
am fb7b3181: (-s ours) am 520a5673: am b152473f: am 9fce8535: Merge "AArch64: Make AssetAtlasService 64-bit compatible" * commit 'fb7b3181fc291b17f4376d1163edd32c4fb8cca7': AArch64: Make AssetAtlasService 64-bit compatible