summaryrefslogtreecommitdiff
path: root/libs/hwui/Program.cpp
diff options
context:
space:
mode:
author Lorenzo Colitti <lorenzo@google.com> 2015-01-30 15:59:49 +0000
committer android-build-merger <android-build-merger@google.com> 2015-01-30 15:59:49 +0000
commit728dace14d83e87e777ceaaf3dfd031cf3502f80 (patch)
tree54f7f318d2f354566aad35f6424968ceb7c6171d /libs/hwui/Program.cpp
parentc519b8042f08a07449a3861c791afe12619b28a0 (diff)
parenta0057ad69083dc09c0c853fd20119f5a9ea877d9 (diff)
Merge "Also include the domain when parceling StaticIpConfiguration." automerge: c565a56 automerge: 5b392ee
automerge: a0057ad * commit 'a0057ad69083dc09c0c853fd20119f5a9ea877d9': Also include the domain when parceling StaticIpConfiguration.
Diffstat (limited to 'libs/hwui/Program.cpp')
0 files changed, 0 insertions, 0 deletions