| commit | bdcb0e52654ea1ec86d90e7e301490f9f4d80c5a | [log] [tgz] |
|---|---|---|
| author | Tim Murray <timmurray@google.com> | Tue Dec 16 21:50:16 2014 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Dec 16 21:50:16 2014 +0000 |
| tree | 5a72c82237ee90ca11f3e02e9fe3dd10d20b2df0 | |
| 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.