| commit | a4a4524adad910a01d8af8bd1fdb2e4530e9ce7c | [log] [tgz] |
|---|---|---|
| author | Patrick Tjin <pattjin@google.com> | Fri Oct 16 21:58:30 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 16 21:58:30 2015 +0000 |
| tree | 477fee607bf561baaffa143cfcfcc8e82b4bdf16 | |
| parent | bf3fb5c2af38ea44acf017ffe72b80b6bc6c4a58 [diff] | |
| parent | 0f2848ada0c60432dc274aa76ed42cd48b6cb675 [diff] |
am 0f2848ad: (-s ours) resolved conflicts for 25016fd2 to lmp-mr1-ub-dev [DO NOT MERGE] * commit '0f2848ada0c60432dc274aa76ed42cd48b6cb675': hwc: fix compilation issue on backport of Ieb91b70 [DO NOT MERGE]