| commit | 18fddfe020f62aefd4d13c8fe88df1027f79ceb7 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Fri Nov 14 19:15:59 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 14 19:15:59 2014 +0000 |
| tree | f5cd570aee0a28dca73d68f1d2b70954bb4e126f | |
| parent | 2e4ad0a64162446f9632b45bf08bf5405fab54f1 [diff] | |
| parent | c25e0dcea982468225c4150dcb699db5185a1eee [diff] |
am c25e0dce: am 5b50cd13: Merge "Frameworks/base: Fix build" * commit 'c25e0dcea982468225c4150dcb699db5185a1eee': Frameworks/base: Fix build