diff options
| author | Tim Murray <timmurray@google.com> | 2014-12-16 21:50:16 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-12-16 21:50:16 +0000 |
| commit | bdcb0e52654ea1ec86d90e7e301490f9f4d80c5a (patch) | |
| tree | 5a72c82237ee90ca11f3e02e9fe3dd10d20b2df0 /libs/hwui/ProgramCache.cpp | |
| parent | a9c56a04a810824fa3b0736250881529ca777ee4 (diff) | |
| parent | 501c710ec556571d33d3e73642eff158544639de (diff) | |
Merge branch \'lmp-mr1-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev-plus-aosp
automerge: 501c710
* commit '501c710ec556571d33d3e73642eff158544639de':
Fix typo with register native allocation.
Diffstat (limited to 'libs/hwui/ProgramCache.cpp')
0 files changed, 0 insertions, 0 deletions